diff --git a/[refs] b/[refs]
index d556cc1cf75f..bb0f580e8cb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a73fdde3990ea840b604248362876437ea8ce80
+refs/heads/master: 36dd2fdb37efdab15844eb72026f8ce3aa0fb560
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 810770f96816..29786d3b9326 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1711,6 +1711,8 @@ static int nfs_validate_mount_data(void *options,
 
 		if (!(data->flags & NFS_MOUNT_TCP))
 			args->nfs_server.protocol = XPRT_TRANSPORT_UDP;
+		else
+			args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 		/* N.B. caller will free nfs_server.hostname in all cases */
 		args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL);
 		args->namlen		= data->namlen;