commit 07a936260a94ae4798527ce8f79d4f3b589ab8a3
author Amerigo Wang <amwang@redhat.com> Mon Oct 29 16:23:10 2012 +0000
committer David S. Miller <davem@davemloft.net> Thu Nov 01 12:41:35 2012 -0400
tree bf8ff84c3045cd3b8b2b2970a6c7491439172939
parent cc535dfb6a85b42218307c43f60668d7bd6f4318

ipv6: use IS_ENABLED()

#if defined(CONFIG_FOO) || defined(CONFIG_FOO_MODULE)

can be replaced by

#if IS_ENABLED(CONFIG_FOO)

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv6/icmp.c

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 24d69db..b4a9fd5 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -280,7 +280,7 @@
 	return 0;
 }
 
-#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6_MIP6)
 static void mip6_addr_swap(struct sk_buff *skb)
 {
 	struct ipv6hdr *iph = ipv6_hdr(skb);