Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / net / sunrpc / svc.c

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 97017989fa1d56e9b120534fd80dc7a84740398c..e4aabc02368b94e0d7b0109ab7906bfbba329b23 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -831,7 +831,7 @@ static int __svc_rpcb_register4(const u32 program, const u32 version,
        return error;
 }
 
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
 /*
  * Register an "inet6" protocol family netid with the local
  * rpcbind daemon via an rpcbind v4 SET request.
@@ -877,7 +877,7 @@ static int __svc_rpcb_register6(const u32 program, const u32 version,
 
        return error;
 }
-#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
+#endif /* IS_ENABLED(CONFIG_IPV6) */
 
 /*
  * Register a kernel RPC service via rpcbind version 4.
@@ -898,11 +898,11 @@ static int __svc_register(const char *progname,
                error = __svc_rpcb_register4(program, version,
                                                protocol, port);
                break;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
        case PF_INET6:
                error = __svc_rpcb_register6(program, version,
                                                protocol, port);
-#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
+#endif
        }
 
        if (error < 0)