Merge "master" into "wdp".

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

diff --git a/ofproto/in-band.h b/ofproto/in-band.h
index 5122e4c..5572466 100644 (file)
--- a/ofproto/in-band.h
+++ b/ofproto/in-band.h
@@ -19,15 +19,15 @@
 
 #include "flow.h"
 
-struct dpif;
 struct in_band;
-struct odp_actions;
+struct xflow_actions;
 struct ofproto;
 struct rconn;
 struct settings;
 struct switch_status;
+struct wdp;
 
-int in_band_create(struct ofproto *, struct dpif *, struct switch_status *,
+int in_band_create(struct ofproto *, struct wdp *, struct switch_status *,
                    struct in_band **);
 void in_band_destroy(struct in_band *);
 
@@ -40,7 +40,7 @@ void in_band_wait(struct in_band *);
 bool in_band_msg_in_hook(struct in_band *, const flow_t *, 
                          const struct ofpbuf *packet);
 bool in_band_rule_check(struct in_band *, const flow_t *,
-                        const struct odp_actions *);
+                        const struct xflow_actions *);
 void in_band_flushed(struct in_band *);
 
 #endif /* in-band.h */