Skip to content

Commit f7c4396

Browse files
longlimsftsmfrench
authored andcommitted
cifs: smbd: Enable signing with smbdirect
Now signing is supported with RDMA transport. Remove the code that disabled it. Signed-off-by: Long Li <[email protected]> Signed-off-by: Steve French <[email protected]> Reviewed-by: Ronnie Sahlberg <[email protected]>
1 parent 2796d30 commit f7c4396

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

fs/cifs/connect.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,14 +1977,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
19771977
goto cifs_parse_mount_err;
19781978
}
19791979

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-
19881980
#ifndef CONFIG_KEYS
19891981
/* Muliuser mounts require CONFIG_KEYS support */
19901982
if (vol->multiuser) {

fs/cifs/smb2pdu.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,6 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
738738

739739
cifs_dbg(FYI, "validate negotiate\n");
740740

741-
#ifdef CONFIG_CIFS_SMB_DIRECT
742-
if (tcon->ses->server->rdma)
743-
return 0;
744-
#endif
745-
746741
/* In SMB3.11 preauth integrity supersedes validate negotiate */
747742
if (tcon->ses->server->dialect == SMB311_PROT_ID)
748743
return 0;

0 commit comments

Comments
 (0)