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/svc.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/svc.c')
-rw-r--r-- | net/sunrpc/svc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 6e038884ae0c..9d01d46b05f3 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -826,7 +826,7 @@ static int __svc_rpcb_register4(const u32 program, const u32 version, | |||
826 | return error; | 826 | return error; |
827 | } | 827 | } |
828 | 828 | ||
829 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 829 | #if IS_ENABLED(CONFIG_IPV6) |
830 | /* | 830 | /* |
831 | * Register an "inet6" protocol family netid with the local | 831 | * Register an "inet6" protocol family netid with the local |
832 | * rpcbind daemon via an rpcbind v4 SET request. | 832 | * rpcbind daemon via an rpcbind v4 SET request. |
@@ -872,7 +872,7 @@ static int __svc_rpcb_register6(const u32 program, const u32 version, | |||
872 | 872 | ||
873 | return error; | 873 | return error; |
874 | } | 874 | } |
875 | #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ | 875 | #endif /* IS_ENABLED(CONFIG_IPV6) */ |
876 | 876 | ||
877 | /* | 877 | /* |
878 | * Register a kernel RPC service via rpcbind version 4. | 878 | * Register a kernel RPC service via rpcbind version 4. |
@@ -893,11 +893,11 @@ static int __svc_register(const char *progname, | |||
893 | error = __svc_rpcb_register4(program, version, | 893 | error = __svc_rpcb_register4(program, version, |
894 | protocol, port); | 894 | protocol, port); |
895 | break; | 895 | break; |
896 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 896 | #if IS_ENABLED(CONFIG_IPV6) |
897 | case PF_INET6: | 897 | case PF_INET6: |
898 | error = __svc_rpcb_register6(program, version, | 898 | error = __svc_rpcb_register6(program, version, |
899 | protocol, port); | 899 | protocol, port); |
900 | #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ | 900 | #endif |
901 | } | 901 | } |
902 | 902 | ||
903 | if (error < 0) | 903 | if (error < 0) |