aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/connect.c8
-rw-r--r--fs/cifs/smb2pdu.c5
2 files changed, 0 insertions, 13 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a5aa158d535a..7a10a5d0731f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1977,14 +1977,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
1977 goto cifs_parse_mount_err; 1977 goto cifs_parse_mount_err;
1978 } 1978 }
1979 1979
1980#ifdef CONFIG_CIFS_SMB_DIRECT
1981 if (vol->rdma && vol->sign) {
1982 cifs_dbg(VFS, "Currently SMB direct doesn't support signing."
1983 " This is being fixed\n");
1984 goto cifs_parse_mount_err;
1985 }
1986#endif
1987
1988#ifndef CONFIG_KEYS 1980#ifndef CONFIG_KEYS
1989 /* Muliuser mounts require CONFIG_KEYS support */ 1981 /* Muliuser mounts require CONFIG_KEYS support */
1990 if (vol->multiuser) { 1982 if (vol->multiuser) {
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 260e9c4219d8..0f48741a0130 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -738,11 +738,6 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
738 738
739 cifs_dbg(FYI, "validate negotiate\n"); 739 cifs_dbg(FYI, "validate negotiate\n");
740 740
741#ifdef CONFIG_CIFS_SMB_DIRECT
742 if (tcon->ses->server->rdma)
743 return 0;
744#endif
745
746 /* In SMB3.11 preauth integrity supersedes validate negotiate */ 741 /* In SMB3.11 preauth integrity supersedes validate negotiate */
747 if (tcon->ses->server->dialect == SMB311_PROT_ID) 742 if (tcon->ses->server->dialect == SMB311_PROT_ID)
748 return 0; 743 return 0;