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 1abb2e1..c0b628a 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -111,6 +111,14 @@ struct sw_flow_key {
                        } nd;
                } ipv6;
        };
+       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. */
 
 struct sw_flow_key_range {
@@ -143,6 +151,7 @@ struct sw_flow_id {
 
 struct sw_flow_actions {
        struct rcu_head rcu;
+       size_t orig_len;        /* From flow_cmd_new netlink actions size */
        u32 actions_len;
        struct nlattr actions[];
 };
@@ -212,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);