Commit b702436a authored by Paul Blakey's avatar Paul Blakey Committed by David S. Miller

net: openvswitch: Fill act ct extension

To give drivers the originating device information for optimized
connection tracking offload, fill in act ct extension with
ifindex from skb.
Signed-off-by: default avatarPaul Blakey <paulb@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9795ded7
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat.h>
#endif #endif
#include <net/netfilter/nf_conntrack_act_ct.h>
#include "datapath.h" #include "datapath.h"
#include "conntrack.h" #include "conntrack.h"
#include "flow.h" #include "flow.h"
...@@ -1045,6 +1047,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, ...@@ -1045,6 +1047,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
*/ */
nf_ct_set_tcp_be_liberal(ct); nf_ct_set_tcp_be_liberal(ct);
} }
nf_conn_act_ct_ext_fill(skb, ct, ctinfo);
} }
return 0; return 0;
...@@ -1245,6 +1249,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key, ...@@ -1245,6 +1249,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,
&info->labels.mask); &info->labels.mask);
if (err) if (err)
return err; return err;
nf_conn_act_ct_ext_add(ct);
} else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) && } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
labels_nonzero(&info->labels.mask)) { labels_nonzero(&info->labels.mask)) {
err = ovs_ct_set_labels(ct, key, &info->labels.value, err = ovs_ct_set_labels(ct, key, &info->labels.value,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment