X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fflow.h;fp=datapath%2Fflow.h;h=835d2ccf3088a302c5e7b2fe5b5993b76cd2504f;hb=78661a5ed344f6f4c3d45d64662a74947b31435d;hp=534c7af24c3f8d4157c7c7427bcaf3f58261dbc6;hpb=7d674866d2c95d9027fc2e64d1acc2044e2c004a;p=sliver-openvswitch.git

diff --git a/datapath/flow.h b/datapath/flow.h
index 534c7af24..835d2ccf3 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -17,7 +17,7 @@
 #include <linux/jiffies.h>
 #include <linux/time.h>
 
-#include "openvswitch/datapath-protocol.h"
+#include "openvswitch/xflow.h"
 #include "table.h"
 
 struct sk_buff;
@@ -25,14 +25,14 @@ struct sk_buff;
 struct sw_flow_actions {
 	struct rcu_head rcu;
 	unsigned int n_actions;
-	union odp_action actions[];
+	union xflow_action actions[];
 };
 
 struct sw_flow {
 	struct rcu_head rcu;
 	struct tbl_node tbl_node;
 
-	struct odp_flow_key key;
+	struct xflow_key key;
 	struct sw_flow_actions *sf_acts;
 
 	spinlock_t lock;	/* Lock for values below. */
@@ -47,10 +47,10 @@ extern struct kmem_cache *flow_cache;
 struct sw_flow_actions *flow_actions_alloc(size_t n_actions);
 void flow_deferred_free(struct sw_flow *);
 void flow_deferred_free_acts(struct sw_flow_actions *);
-int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *);
+int flow_extract(struct sk_buff *, u16 in_port, struct xflow_key *);
 void flow_used(struct sw_flow *, struct sk_buff *);
 
-u32 flow_hash(const struct odp_flow_key *key);
+u32 flow_hash(const struct xflow_key *key);
 int flow_cmp(const struct tbl_node *, void *target);
 void flow_free_tbl(struct tbl_node *);