Merge "master" into "wdp".

[sliver-openvswitch.git] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index 4a393cb..5e2da59 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -15,7 +15,7 @@
 #include <linux/rcupdate.h>
 #include <linux/gfp.h>
 
-#include "openvswitch/datapath-protocol.h"
+#include "openvswitch/xflow.h"
 #include "table.h"
 
 struct sk_buff;
@@ -23,14 +23,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;
 
        struct timespec used;   /* Last used time. */
@@ -48,11 +48,11 @@ 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 *);
 
 struct sw_flow *flow_cast(const struct tbl_node *);
-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 *);