summaryrefslogtreecommitdiffstats
path: root/include/net/netfilter/nf_nat.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-04 18:29:16 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-06 11:16:25 +0100
commitf199bdbaab37585ff6912dfb5524cf2a0ef06a05 (patch)
tree8f6aa15ec859e7521f31ee69797b604cf5d09d1c /include/net/netfilter/nf_nat.h
parent99d6d4e0c50c6e64e3cca11dc77538cadcf3b2e2 (diff)
downloadlinux-stable-f199bdbaab37585ff6912dfb5524cf2a0ef06a05.tar.gz
linux-stable-f199bdbaab37585ff6912dfb5524cf2a0ef06a05.tar.bz2
linux-stable-f199bdbaab37585ff6912dfb5524cf2a0ef06a05.zip
Revert "netfilter: move nat hlist_head to nf_conn"
This reverts commit 7c9664351980aaa6a4b8837a314360b3a4ad382a as it is not working properly. Please move to 4.9 to get the full fix. Reported-by: Pablo Neira Ayuso <pablo@netfilter.org> Cc: Florian Westphal <fw@strlen.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/netfilter/nf_nat.h')
-rw-r--r--include/net/netfilter/nf_nat.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 02515f7ed4cc..344b1ab19220 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -29,6 +29,8 @@ struct nf_conn;
/* The structure embedded in the conntrack structure. */
struct nf_conn_nat {
+ struct hlist_node bysource;
+ struct nf_conn *ct;
union nf_conntrack_nat_help help;
#if IS_ENABLED(CONFIG_NF_NAT_MASQUERADE_IPV4) || \
IS_ENABLED(CONFIG_NF_NAT_MASQUERADE_IPV6)