diff options
| author |   Patrick McHardy <kaber@trash.net> | 2007-03-04 15:57:25 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-03-05 13:25:19 -0800 |
| commit | e281db5cdfc3ab077ab3e459d098cb4fde0bc57a (patch) | |
| tree | 608936adc43ceef89aa076c9e785100f382a6bed /net/netfilter/nf_conntrack_core.c | |
| parent | [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops (diff) | |
| download | linux-dev-e281db5cdfc3ab077ab3e459d098cb4fde0bc57a.tar.xz linux-dev-e281db5cdfc3ab077ab3e459d098cb4fde0bc57a.zip | |
[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 4fdf4849baf8..b3a70eb6d42a 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, } EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct); -#if defined(CONFIG_NF_CT_NETLINK) || \ - defined(CONFIG_NF_CT_NETLINK_MODULE) +#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_conntrack.h> |