diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-03-23 11:17:07 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:27:44 -0700 |
commit | 5f79e0f916a3bdeccc910fdf466bca582a9b2cca (patch) | |
tree | ef6cb09587609597e611ad38c313df88d8ff2e8b /net/netfilter | |
parent | e6f689db51a789807edede411b32eb7c9e457948 (diff) | |
download | op-kernel-dev-5f79e0f916a3bdeccc910fdf466bca582a9b2cca.zip op-kernel-dev-5f79e0f916a3bdeccc910fdf466bca582a9b2cca.tar.gz |
[NETFILTER]: nf_conntrack: don't use nfct in skb if conntrack is disabled
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index d802b34..fe5f22d 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -240,6 +240,7 @@ void nf_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb, } EXPORT_SYMBOL(nf_proto_csum_replace4); +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) /* This does not belong here, but locally generated errors need it if connection tracking in use: without this, connection may not be in hash table, and hence manufactured ICMP or RST packets will not be associated with it. */ @@ -259,6 +260,7 @@ void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) } } EXPORT_SYMBOL(nf_ct_attach); +#endif #ifdef CONFIG_PROC_FS struct proc_dir_entry *proc_net_netfilter; |