tests: Add bundle action test with buffer realloc.

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

diff --git a/datapath/flow.h b/datapath/flow.h
index 08c236e..c0b628a 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -114,7 +114,9 @@ struct sw_flow_key {
        struct {
                /* Connection tracking fields. */
                u16 zone;
+               u32 mark;
                u8 state;
+               struct ovs_key_ct_labels labels;
        } ct;
 
 } __aligned(BITS_PER_LONG/8); /* Ensure that we can do comparisons as longs. */
@@ -219,7 +221,7 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
                         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,
+int ovs_flow_key_extract_userspace(struct net *net, const struct nlattr *attr,
                                   struct sk_buff *skb,
                                   struct sw_flow_key *key, bool log);