compat: Add a struct net parameter to l4_pkt_to_tuple.
authorJoe Stringer <joe@ovn.org>
Mon, 2 May 2016 18:19:10 +0000 (11:19 -0700)
committerJoe Stringer <joe@ovn.org>
Tue, 3 May 2016 00:06:36 +0000 (17:06 -0700)
commitfa67f8e0700a57f81f467abd99e9753cc13a5cc0
tree69c10da9ca1fe014f1e607ecc154c02c361c5a94
parent8ecb3068daaba7a3a11b68ab4b171591b48b7994
compat: Add a struct net parameter to l4_pkt_to_tuple.

Upstream commit:
    netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple

    As gre does not have the srckey in the packet gre_pkt_to_tuple
    needs to perform a lookup in it's per network namespace tables.

    Pass in the proper network namespace to all pkt_to_tuple
    implementations to ensure gre (and any similar protocols) can get this
    right.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Upstream: a31f1adc0948 ("netfilter: nf_conntrack: Add a struct net
parameter to l4_pkt_to_tuple")
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
acinclude.m4
datapath/conntrack.c
datapath/linux/Modules.mk
datapath/linux/compat/include/net/netfilter/nf_conntrack.h [new file with mode: 0644]