Merge citrix branch into master.

[sliver-openvswitch.git] / ofproto / in-band.h

diff --git a/secchan/in-band.h b/ofproto/in-band.h
similarity index 88%
rename from secchan/in-band.h
rename to ofproto/in-band.h
index 736ad76..ddbc5e5 100644 (file)
--- a/secchan/in-band.h
+++ b/ofproto/in-band.h
@@ -24,12 +24,11 @@ struct in_band;
 struct odp_actions;
 struct ofproto;
 struct rconn;
-struct secchan;
 struct settings;
 struct switch_status;
 
-void in_band_create(struct ofproto *, struct dpif *, struct switch_status *,
-                    struct rconn *controller, struct in_band **);
+int in_band_create(struct ofproto *, struct dpif *, struct switch_status *,
+                   struct rconn *controller, struct in_band **);
 void in_band_destroy(struct in_band *);
 void in_band_run(struct in_band *);
 bool in_band_msg_in_hook(struct in_band *, const flow_t *,