diff options
author | Patrick McHardy <kaber@trash.net> | 2007-03-04 18:57:25 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-03-05 16:25:19 -0500 |
commit | e281db5cdfc3ab077ab3e459d098cb4fde0bc57a (patch) | |
tree | 608936adc43ceef89aa076c9e785100f382a6bed /net/netfilter/nf_conntrack_core.c | |
parent | ec68e97dedacc1c7fb20a4b23b7fa76bee56b5ff (diff) |
[NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
The nf_conntrack_netlink config option is named CONFIG_NF_CT_NETLINK,
but multiple files use CONFIG_IP_NF_CONNTRACK_NETLINK or
CONFIG_NF_CONNTRACK_NETLINK for ifdefs.
Fix this and reformat all CONFIG_NF_CT_NETLINK ifdefs to only use a line.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 4fdf4849baf..b3a70eb6d42 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -976,8 +976,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, | |||
976 | } | 976 | } |
977 | EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct); | 977 | EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct); |
978 | 978 | ||
979 | #if defined(CONFIG_NF_CT_NETLINK) || \ | 979 | #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) |
980 | defined(CONFIG_NF_CT_NETLINK_MODULE) | ||
981 | 980 | ||
982 | #include <linux/netfilter/nfnetlink.h> | 981 | #include <linux/netfilter/nfnetlink.h> |
983 | #include <linux/netfilter/nfnetlink_conntrack.h> | 982 | #include <linux/netfilter/nfnetlink_conntrack.h> |