secchan: Remove ofproto hook functions that are no longer used.

diff --git a/secchan/ofproto.c b/secchan/ofproto.c
index 3ff45acd2b8d6706fc6cab5c303029fb6e4d6fa8..e11eed2a115eb7b60af7d4dc489af9d48c9dcfc9 100644 (file)
--- a/secchan/ofproto.c
+++ b/secchan/ofproto.c
@@ -2766,16 +2766,8 @@ handle_odp_msg(struct ofproto *p, struct ofpbuf *packet)
 
     rule = lookup_valid_rule(p, &flow);
     if (!rule) {
-        struct ofport *port;
-
-        if (p->ofhooks->packet_in_cb
-            && p->ofhooks->packet_in_cb(&flow, &payload, p->aux)) {
-            ofpbuf_delete(packet);
-            return;
-        }
-
         /* Don't send a packet-in if OFPPC_NO_PACKET_IN asserted. */
-        port = port_array_get(&p->ports, msg->port);
+        struct ofport *port = port_array_get(&p->ports, msg->port);
         if (port) {
             if (port->opp.config & OFPPC_NO_PACKET_IN) {
                 /* XXX install 'drop' flow entry */
@@ -3154,8 +3146,6 @@ default_normal_ofhook_cb(const flow_t *flow, bool revalidating,
 }
 
 static const struct ofhooks default_ofhooks = {
-    NULL,
-    NULL,
     NULL,
     default_normal_ofhook_cb,
 };

diff --git a/secchan/ofproto.h b/secchan/ofproto.h
index 4a16a3ca2f825642ce274e38862e954ba937e44a..a90f23f82f5699b6e3750d19a765d32de0750199 100644 (file)
--- a/secchan/ofproto.h
+++ b/secchan/ofproto.h
@@ -112,9 +112,6 @@ void ofproto_flush_flows(struct ofproto *);
 struct ofhooks {
     void (*port_changed_cb)(enum ofp_port_reason, const struct ofp_phy_port *,
                             void *aux);
-    bool (*packet_in_cb)(const flow_t *, const struct ofpbuf *payload,
-                         void *aux);
-    void (*flow_expired_cb)(const struct ofexpired *, void *aux);
     void (*normal_cb)(const flow_t *, bool revalidating,
                       struct odp_actions *, tag_type *, void *aux);
 };

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 4567e66dee532916fe01c1188b3678e2589749a3..0248c8dd16c4488d41bb01124c07cb14c82295bd 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1661,8 +1661,6 @@ bridge_normal_ofhook_cb(const flow_t *flow, bool revalidating,
 
 static struct ofhooks bridge_ofhooks = {
     bridge_port_changed_ofhook_cb,
-    NULL,
-    NULL,
     bridge_normal_ofhook_cb,
 };
 \f