]> git.proxmox.com Git - mirror_ovs.git/commit
datapath: handle NF_REPEAT from nf_conntrack_in()
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 16 Feb 2017 01:34:20 +0000 (17:34 -0800)
committerJoe Stringer <joe@ovn.org>
Thu, 2 Mar 2017 23:51:38 +0000 (15:51 -0800)
commita6d28f7c35b20023132a294ae37a5ede199d40ed
tree6febeedf08d8fd35508a0b390179bf0025e7bd7d
parent6c0bf0917f4396bec09b7041ccd92ef0e7e2bd2e
datapath: handle NF_REPEAT from nf_conntrack_in()

Upstream commit:
    commit 08733a0cb7decce40bbbd0331a0449465f13c444
    Author: Pablo Neira Ayuso <pablo@netfilter.org>
    Date:   Thu Nov 3 10:56:43 2016 +0100

    netfilter: handle NF_REPEAT from nf_conntrack_in()

    NF_REPEAT is only needed from nf_conntrack_in() under a very specific
    case required by the TCP protocol tracker, we can handle this case
    without returning to the core hook path. Handling of NF_REPEAT from the
    nf_reinject() is left untouched.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
[Committer notes]
    Shift the functionality into the compat code, protected by v4.10
    version check. This allows the datapath/conntrack.c to match
    upstream.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Signed-off-by: Joe Stringer <joe@ovn.org>
datapath/conntrack.c
datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h