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 /net/sunrpc/addr.c | |
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 'net/sunrpc/addr.c')
-rw-r--r-- | net/sunrpc/addr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 67a655ee82a9..ee77742e0ed6 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | #include <linux/export.h> | 22 | #include <linux/export.h> |
23 | 23 | ||
24 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 24 | #if IS_ENABLED(CONFIG_IPV6) |
25 | 25 | ||
26 | static size_t rpc_ntop6_noscopeid(const struct sockaddr *sap, | 26 | static size_t rpc_ntop6_noscopeid(const struct sockaddr *sap, |
27 | char *buf, const int buflen) | 27 | char *buf, const int buflen) |
@@ -91,7 +91,7 @@ static size_t rpc_ntop6(const struct sockaddr *sap, | |||
91 | return len; | 91 | return len; |
92 | } | 92 | } |
93 | 93 | ||
94 | #else /* !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) */ | 94 | #else /* !IS_ENABLED(CONFIG_IPV6) */ |
95 | 95 | ||
96 | static size_t rpc_ntop6_noscopeid(const struct sockaddr *sap, | 96 | static size_t rpc_ntop6_noscopeid(const struct sockaddr *sap, |
97 | char *buf, const int buflen) | 97 | char *buf, const int buflen) |
@@ -105,7 +105,7 @@ static size_t rpc_ntop6(const struct sockaddr *sap, | |||
105 | return 0; | 105 | return 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | #endif /* !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) */ | 108 | #endif /* !IS_ENABLED(CONFIG_IPV6) */ |
109 | 109 | ||
110 | static int rpc_ntop4(const struct sockaddr *sap, | 110 | static int rpc_ntop4(const struct sockaddr *sap, |
111 | char *buf, const size_t buflen) | 111 | char *buf, const size_t buflen) |
@@ -155,7 +155,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, | |||
155 | return sizeof(struct sockaddr_in); | 155 | return sizeof(struct sockaddr_in); |
156 | } | 156 | } |
157 | 157 | ||
158 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 158 | #if IS_ENABLED(CONFIG_IPV6) |
159 | static int rpc_parse_scope_id(const char *buf, const size_t buflen, | 159 | static int rpc_parse_scope_id(const char *buf, const size_t buflen, |
160 | const char *delim, struct sockaddr_in6 *sin6) | 160 | const char *delim, struct sockaddr_in6 *sin6) |
161 | { | 161 | { |