X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=f92a523fd243506f802a1347b1b68f6231513ff2;hb=a91da17ea6f910863c2a771ebfa4100bbad3f481;hp=429e678229c8545dee0a2ae5b6fe65943f06aea3;hpb=e03248b7cb460a79d6e4b4aef5815d59f3d0ea32;p=sliver-openvswitch.git

diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
index 429e67822..f92a523fd 100644
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -125,7 +125,7 @@ void ofconn_send_error(const struct ofconn *, const struct ofp_header *request,
                        enum ofperr);
 
 enum ofperr ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,
-                                   struct ofpbuf **bufferp, uint16_t *in_port);
+                                   struct ofpbuf **bufferp, ofp_port_t *in_port);
 
 bool ofconn_has_pending_opgroups(const struct ofconn *);
 void ofconn_add_opgroup(struct ofconn *, struct list *);
@@ -156,10 +156,7 @@ void connmgr_set_extra_in_band_remotes(struct connmgr *,
 void connmgr_set_in_band_queue(struct connmgr *, int queue_id);
 
 /* In-band implementation. */
-bool connmgr_must_output_local(struct connmgr *, const struct flow *,
-                               uint32_t local_odp_port,
-                               const struct nlattr *odp_actions,
-                               size_t actions_len);
+bool connmgr_has_in_band(struct connmgr *);
 
 /* Fail-open and in-band implementation. */
 void connmgr_flushed(struct connmgr *);
@@ -173,7 +170,7 @@ struct ofmonitor {
     enum nx_flow_monitor_flags flags;
 
     /* Matching. */
-    uint16_t out_port;
+    ofp_port_t out_port;
     uint8_t table_id;
     struct minimatch match;
 };