diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-15 13:32:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-15 13:32:48 -0400 |
| commit | 909b27f706433a0b3dff79aa259de63aafe40a42 (patch) | |
| tree | c13cda633379cdbef701e730027b6a19ba6b267e /net/openvswitch/conntrack.c | |
| parent | 8fbb89c6fbfd1cda9ae413cd1e042837a8edbdeb (diff) | |
| parent | 272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff) | |
| download | lwn-909b27f706433a0b3dff79aa259de63aafe40a42.tar.gz lwn-909b27f706433a0b3dff79aa259de63aafe40a42.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.
The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.
Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
net/ipv4/ip_gre.c
net/netfilter/nf_conntrack_core.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/conntrack.c')
| -rw-r--r-- | net/openvswitch/conntrack.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 9f0bc49fa969..3d5feede962d 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -768,6 +768,19 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, return -EINVAL; } + /* Userspace may decide to perform a ct lookup without a helper + * specified followed by a (recirculate and) commit with one. + * Therefore, for unconfirmed connections which we will commit, + * we need to attach the helper here. + */ + if (!nf_ct_is_confirmed(ct) && info->commit && + info->helper && !nfct_help(ct)) { + int err = __nf_ct_try_assign_helper(ct, info->ct, + GFP_ATOMIC); + if (err) + return err; + } + /* Call the helper only if: * - nf_conntrack_in() was executed above ("!cached") for a * confirmed connection, or |