diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-12-10 04:48:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-11 18:25:16 -0500 |
| commit | dfd56b8b38fff3586f36232db58e1e9f7885a605 (patch) | |
| tree | 64c7142ebf4625939f68bd3603f1d37bacb20a73 /include/linux/errqueue.h | |
| parent | 1ded132d4c3442aa3a619c94c245d7b5e0eb9731 (diff) | |
net: use IS_ENABLED(CONFIG_IPV6)
Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index c9f522bd17e4..fd0628be45ce 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h | |||
| @@ -25,7 +25,7 @@ struct sock_extended_err { | |||
| 25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
| 26 | 26 | ||
| 27 | #include <net/ip.h> | 27 | #include <net/ip.h> |
| 28 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 28 | #if IS_ENABLED(CONFIG_IPV6) |
| 29 | #include <linux/ipv6.h> | 29 | #include <linux/ipv6.h> |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| @@ -34,7 +34,7 @@ struct sock_extended_err { | |||
| 34 | struct sock_exterr_skb { | 34 | struct sock_exterr_skb { |
| 35 | union { | 35 | union { |
| 36 | struct inet_skb_parm h4; | 36 | struct inet_skb_parm h4; |
| 37 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 37 | #if IS_ENABLED(CONFIG_IPV6) |
| 38 | struct inet6_skb_parm h6; | 38 | struct inet6_skb_parm h6; |
| 39 | #endif | 39 | #endif |
| 40 | } header; | 40 | } header; |
