Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / client.c

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8f760f23748c6d5ab47c86f67abe6433c709d8ff..989c30c98511d9d8404803803e4d1a9b7a462a9a 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -474,6 +474,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
                        to->to_maxval = to->to_initval;
                to->to_exponential = 0;
                break;
+#ifndef CONFIG_NFS_DISABLE_UDP_SUPPORT
        case XPRT_TRANSPORT_UDP:
                if (retrans == NFS_UNSPEC_RETRANS)
                        to->to_retries = NFS_DEF_UDP_RETRANS;
@@ -484,6 +485,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
                to->to_maxval = NFS_MAX_UDP_TIMEOUT;
                to->to_exponential = 1;
                break;
+#endif
        default:
                BUG();
        }
@@ -580,8 +582,10 @@ static int nfs_start_lockd(struct nfs_server *server)
                default:
                        nlm_init.protocol = IPPROTO_TCP;
                        break;
+#ifndef CONFIG_NFS_DISABLE_UDP_SUPPORT
                case XPRT_TRANSPORT_UDP:
                        nlm_init.protocol = IPPROTO_UDP;
+#endif
        }
 
        host = nlmclnt_init(&nlm_init);