Makefile.am: Clean flake8-check too.

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

diff --git a/datapath/flow.c b/datapath/flow.c
index 3375d7b..057dde1 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -46,6 +46,7 @@
 #include <net/ndisc.h>
 
 #include "datapath.h"
+#include "conntrack.h"
 #include "flow.h"
 #include "flow_netlink.h"
 #include "vport.h"
@@ -711,20 +712,21 @@ int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
        key->phy.priority = skb->priority;
        key->phy.in_port = OVS_CB(skb)->input_vport->port_no;
        key->phy.skb_mark = skb->mark;
+       ovs_ct_fill_key(skb, key);
        key->ovs_flow_hash = 0;
        key->recirc_id = 0;
 
        return key_extract(skb, key);
 }
 
-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)
 {
        int err;
 
        /* Extract metadata from netlink attributes. */
-       err = ovs_nla_get_flow_metadata(attr, key, log);
+       err = ovs_nla_get_flow_metadata(net, attr, key, log);
        if (err)
                return err;