diff options
author | Amerigo Wang <amwang@redhat.com> | 2012-10-29 16:23:10 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-01 12:41:35 -0400 |
commit | 07a936260a94ae4798527ce8f79d4f3b589ab8a3 (patch) | |
tree | bf8ff84c3045cd3b8b2b2970a6c7491439172939 /net/ipv6/icmp.c | |
parent | cc535dfb6a85b42218307c43f60668d7bd6f4318 (diff) | |
download | blackbird-op-linux-07a936260a94ae4798527ce8f79d4f3b589ab8a3.tar.gz blackbird-op-linux-07a936260a94ae4798527ce8f79d4f3b589ab8a3.zip |
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>
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r-- | net/ipv6/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 24d69dbca4d6..b4a9fd51dae7 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -280,7 +280,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st 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); |