diff options
| author | Steve French <stfrench@microsoft.com> | 2018-06-29 03:30:23 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-08-07 22:15:56 +0300 |
| commit | 0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6 (patch) | |
| tree | ce9ba98d9fb47d68a40bd53307286e0a988b6f70 /fs/cifs/transport.c | |
| parent | 950132afd59385caf6e2b84e5235d069fa10681d (diff) | |
| download | linux-0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6.tar.xz | |
smb3: simplify code by removing CONFIG_CIFS_SMB311
We really, really want to be encouraging use of secure dialects,
and SMB3.1.1 offers useful security features, and will soon
be the recommended dialect for many use cases. Simplify the code
by removing the CONFIG_CIFS_SMB311 ifdef so users don't disable
it in the build, and create compatibility and/or security issues
with modern servers - many of which have been supporting this
dialect for multiple years.
Also clarify some of the Kconfig text for cifs.ko about
SMB3.1.1 and current supported features in the module.
Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index a341ec839c83..0f9156af5eb0 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -807,11 +807,9 @@ cifs_send_recv(const unsigned int xid, struct cifs_ses *ses, if (rc < 0) goto out; -#ifdef CONFIG_CIFS_SMB311 if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP)) smb311_update_preauth_hash(ses, rqst->rq_iov, rqst->rq_nvec); -#endif if (timeout == CIFS_ASYNC_OP) goto out; @@ -852,7 +850,6 @@ cifs_send_recv(const unsigned int xid, struct cifs_ses *ses, else *resp_buf_type = CIFS_SMALL_BUFFER; -#ifdef CONFIG_CIFS_SMB311 if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP)) { struct kvec iov = { .iov_base = resp_iov->iov_base, @@ -860,7 +857,6 @@ cifs_send_recv(const unsigned int xid, struct cifs_ses *ses, }; smb311_update_preauth_hash(ses, &iov, 1); } -#endif credits = ses->server->ops->get_credits(midQ); |