2 files changed, 0 insertions, 33 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 1c16de9611e9..0ce72dcd6b96 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1799,27 +1799,6 @@ config SUNRPC_XPRT_RDMA
 
           If unsure, say N.
 
-config SUNRPC_BIND34
-        bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
-        depends on SUNRPC && EXPERIMENTAL
-        default n
-        help
-          RPC requests over IPv6 networks require support for larger
-          addresses when performing an RPC bind.  Sun added support for
-          IPv6 addressing by creating two new versions of the rpcbind
-          protocol (RFC 1833).
-
-          This option enables support in the kernel RPC client for
-          querying rpcbind servers via versions 3 and 4 of the rpcbind
-          protocol.  The kernel automatically falls back to version 2
-          if a remote rpcbind service does not support versions 3 or 4.
-          By themselves, these new versions do not provide support for
-          RPC over IPv6, but the new protocol versions are necessary to
-          support it.
-
-          If unsure, say N to get traditional behavior (version 2 rpcbind
-          requests only).
-
 config RPCSEC_GSS_KRB5
         tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
         depends on SUNRPC && EXPERIMENTAL
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 625ba72e624a..c62e446723ae 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -592,16 +592,6 @@ static struct rpc_procinfo rpcb_procedures4[] = {
 };
 
 static struct rpcb_info rpcb_next_version[] = {
-#ifdef CONFIG_SUNRPC_BIND34
-        {
-                .rpc_vers       = RPCBVERS_4,
-                .rpc_proc       = &rpcb_procedures4[RPCBPROC_GETADDR],
-        },
-        {
-                .rpc_vers       = RPCBVERS_3,
-                .rpc_proc       = &rpcb_procedures3[RPCBPROC_GETADDR],
-        },
-#endif
         {
                 .rpc_vers       = RPCBVERS_2,
                 .rpc_proc       = &rpcb_procedures2[RPCBPROC_GETPORT],
@@ -612,7 +602,6 @@ static struct rpcb_info rpcb_next_version[] = {
 };
 
 static struct rpcb_info rpcb_next_version6[] = {
-#ifdef CONFIG_SUNRPC_BIND34
         {
                 .rpc_vers       = RPCBVERS_4,
                 .rpc_proc       = &rpcb_procedures4[RPCBPROC_GETADDR],
@@ -621,7 +610,6 @@ static struct rpcb_info rpcb_next_version6[] = {
                 .rpc_vers       = RPCBVERS_3,
                 .rpc_proc       = &rpcb_procedures3[RPCBPROC_GETADDR],
         },
-#endif
         {
                 .rpc_proc       = NULL,
         },