summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJeremy Sowden <jeremy@azazel.net>2019-09-13 11:13:14 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2019-09-13 13:47:11 +0300
commit261db6c2fbd64a2e649fdfa5f75cf161c384d110 (patch)
tree97b35b77f16dab116d15560f0a27559bd0cecdb2 /net
parentf1815650b547db745bef35f74395e113fcf62cac (diff)
downloadlinux-261db6c2fbd64a2e649fdfa5f75cf161c384d110.tar.xz
netfilter: conntrack: move code to linux/nf_conntrack_common.h.
Move some `struct nf_conntrack` code from linux/skbuff.h to linux/nf_conntrack_common.h. Together with a couple of helpers for getting and setting skb->_nfct, it allows us to remove CONFIG_NF_CONNTRACK checks from net/netfilter/nf_conntrack.h. Signed-off-by: Jeremy Sowden <jeremy@azazel.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_standalone.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 88d4127df863..410809c669e1 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -1167,7 +1167,6 @@ static int __init nf_conntrack_standalone_init(void)
if (ret < 0)
goto out_start;
- BUILD_BUG_ON(SKB_NFCT_PTRMASK != NFCT_PTRMASK);
BUILD_BUG_ON(NFCT_INFOMASK <= IP_CT_NUMBER);
#ifdef CONFIG_SYSCTL