diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-10-29 12:23:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-01 12:41:35 -0400 |
| commit | 07a936260a94ae4798527ce8f79d4f3b589ab8a3 (patch) | |
| tree | bf8ff84c3045cd3b8b2b2970a6c7491439172939 /net/ipv6/ipv6_sockglue.c | |
| parent | cc535dfb6a85b42218307c43f60668d7bd6f4318 (diff) | |
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/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index ba6d13d1f1e1..a7bee6a91335 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
| @@ -397,7 +397,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, | |||
| 397 | if (optname == IPV6_RTHDR && opt && opt->srcrt) { | 397 | if (optname == IPV6_RTHDR && opt && opt->srcrt) { |
| 398 | struct ipv6_rt_hdr *rthdr = opt->srcrt; | 398 | struct ipv6_rt_hdr *rthdr = opt->srcrt; |
| 399 | switch (rthdr->type) { | 399 | switch (rthdr->type) { |
| 400 | #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE) | 400 | #if IS_ENABLED(CONFIG_IPV6_MIP6) |
| 401 | case IPV6_SRCRT_TYPE_2: | 401 | case IPV6_SRCRT_TYPE_2: |
| 402 | if (rthdr->hdrlen != 2 || | 402 | if (rthdr->hdrlen != 2 || |
| 403 | rthdr->segments_left != 1) | 403 | rthdr->segments_left != 1) |