diff options
| author | Long Li <longli@microsoft.com> | 2018-04-25 11:30:05 -0700 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2018-05-09 11:48:35 -0500 |
| commit | f7c439668a291ca94f358e44d3a3e9f2a2524b8a (patch) | |
| tree | f4e52a847a608cf27ab5176dd99972b6047e2938 /fs | |
| parent | 2796d303e3c5ec213c578ed3a66872205c126eb8 (diff) | |
| download | linux-stable-f7c439668a291ca94f358e44d3a3e9f2a2524b8a.tar.gz linux-stable-f7c439668a291ca94f358e44d3a3e9f2a2524b8a.tar.bz2 linux-stable-f7c439668a291ca94f358e44d3a3e9f2a2524b8a.zip | |
cifs: smbd: Enable signing with smbdirect
Now signing is supported with RDMA transport.
Remove the code that disabled it.
Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 8 | ||||
| -rw-r--r-- | fs/cifs/smb2pdu.c | 5 |
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, goto cifs_parse_mount_err; } -#ifdef CONFIG_CIFS_SMB_DIRECT - if (vol->rdma && vol->sign) { - cifs_dbg(VFS, "Currently SMB direct doesn't support signing." - " This is being fixed\n"); - goto cifs_parse_mount_err; - } -#endif - #ifndef CONFIG_KEYS /* Muliuser mounts require CONFIG_KEYS support */ 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) cifs_dbg(FYI, "validate negotiate\n"); -#ifdef CONFIG_CIFS_SMB_DIRECT - if (tcon->ses->server->rdma) - return 0; -#endif - /* In SMB3.11 preauth integrity supersedes validate negotiate */ if (tcon->ses->server->dialect == SMB311_PROT_ID) return 0; |