aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/core.c
diff options
context:
space:
mode:
authorIgor Maravić <igorm@etf.rs>2011-12-12 02:58:24 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-16 15:49:52 -0500
commitc0cd115667bcd23c2a31fe2114beaab3608de68c (patch)
tree886a94793dcbe9797c593d465aa4f37039231422 /net/netfilter/core.c
parentnet:x25: use IS_ENABLED (diff)
downloadlinux-dev-c0cd115667bcd23c2a31fe2114beaab3608de68c.tar.xz
linux-dev-c0cd115667bcd23c2a31fe2114beaab3608de68c.zip
net:netfilter: use IS_ENABLED
Use IS_ENABLED(CONFIG_FOO) instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE) Signed-off-by: Igor Maravić <igorm@etf.rs> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/core.c')
-rw-r--r--net/netfilter/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 4aa0f4b19bd8..b4e8ff05b301 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -229,7 +229,7 @@ int skb_make_writable(struct sk_buff *skb, unsigned int writable_len)
}
EXPORT_SYMBOL(skb_make_writable);
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
/* 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. */