datapath: refactor ovs flow extract API.

[cascardo/ovs.git] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index 1bb6ce0..ffe2879 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -74,6 +74,8 @@ struct sw_flow_key {
                u32     skb_mark;       /* SKB mark. */
                u16     in_port;        /* Input switch port (or DP_MAX_PORTS). */
        } __packed phy; /* Safe when right after 'tun_key'. */
+       u32 ovs_flow_hash;              /* Datapath computed hash value.  */
+       u32 recirc_id;                  /* Recirculation ID.  */
        struct {
                u8     src[ETH_ALEN];   /* Ethernet source address. */
                u8     dst[ETH_ALEN];   /* Ethernet destination address. */
@@ -125,7 +127,6 @@ struct sw_flow_key_range {
 struct sw_flow_mask {
        int ref_count;
        struct rcu_head rcu;
-       struct list_head list;
        struct sw_flow_key_range range;
        struct sw_flow_key key;
 };
@@ -189,6 +190,10 @@ void ovs_flow_stats_get(const struct sw_flow *, struct ovs_flow_stats *,
 void ovs_flow_stats_clear(struct sw_flow *);
 u64 ovs_flow_used_time(unsigned long flow_jiffies);
 
-int ovs_flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *);
+int ovs_flow_key_extract(struct sk_buff *skb, struct sw_flow_key *key);
+/* Extract key from packet coming from userspace. */
+int ovs_flow_key_extract_userspace(const struct nlattr *attr,
+                                  struct sk_buff *skb,
+                                  struct sw_flow_key *key);
 
 #endif /* flow.h */