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/sunrpc | |
| 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/sunrpc')
| -rw-r--r-- | include/linux/sunrpc/clnt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index f15fd985b08a..2c5993a17c33 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h | |||
| @@ -215,7 +215,7 @@ static inline bool __rpc_copy_addr4(struct sockaddr *dst, | |||
| 215 | return true; | 215 | return true; |
| 216 | } | 216 | } |
| 217 | 217 | ||
| 218 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 218 | #if IS_ENABLED(CONFIG_IPV6) |
| 219 | static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1, | 219 | static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1, |
| 220 | const struct sockaddr *sap2) | 220 | const struct sockaddr *sap2) |
| 221 | { | 221 | { |
| @@ -240,7 +240,7 @@ static inline bool __rpc_copy_addr6(struct sockaddr *dst, | |||
| 240 | dsin6->sin6_addr = ssin6->sin6_addr; | 240 | dsin6->sin6_addr = ssin6->sin6_addr; |
| 241 | return true; | 241 | return true; |
| 242 | } | 242 | } |
| 243 | #else /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */ | 243 | #else /* !(IS_ENABLED(CONFIG_IPV6) */ |
| 244 | static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1, | 244 | static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1, |
| 245 | const struct sockaddr *sap2) | 245 | const struct sockaddr *sap2) |
| 246 | { | 246 | { |
| @@ -252,7 +252,7 @@ static inline bool __rpc_copy_addr6(struct sockaddr *dst, | |||
| 252 | { | 252 | { |
| 253 | return false; | 253 | return false; |
| 254 | } | 254 | } |
| 255 | #endif /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */ | 255 | #endif /* !(IS_ENABLED(CONFIG_IPV6) */ |
| 256 | 256 | ||
| 257 | /** | 257 | /** |
| 258 | * rpc_cmp_addr - compare the address portion of two sockaddrs. | 258 | * rpc_cmp_addr - compare the address portion of two sockaddrs. |
