projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
[linux-2.6-block.git]
/
net
/
netfilter
/
nf_nat_core.c
diff --git
a/net/netfilter/nf_nat_core.c
b/net/netfilter/nf_nat_core.c
index a49907b1dabc973a0714712ffea5605251afbf71..552f97cd9fde5c510ac055642affb66adbda181d 100644
(file)
--- a/
net/netfilter/nf_nat_core.c
+++ b/
net/netfilter/nf_nat_core.c
@@
-710,7
+710,7
@@
static struct nf_ct_ext_type nat_extend __read_mostly = {
.flags = NF_CT_EXT_F_PREALLOC,
};
-#if
defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE
)
+#if
IS_ENABLED(CONFIG_NF_CT_NETLINK
)
#include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h>