summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-08-03 03:17:43 +0000
committerSteve French <sfrench@us.ibm.com>2011-08-03 03:17:43 +0000
commitfc05a78efb8e91e884017bb0bc43f690aa5b4dcd (patch)
treef4894033b0d52ca153ed98b597d721f88e160f25 /fs
parent5f66d2b58ca879e70740c82422354144845d6dd3 (diff)
downloadop-kernel-dev-fc05a78efb8e91e884017bb0bc43f690aa5b4dcd.zip
op-kernel-dev-fc05a78efb8e91e884017bb0bc43f690aa5b4dcd.tar.gz
Revert "cifs: advertise the right receive buffer size to the server"
This reverts commit c4d3396b261473ded6f370edd1e79ba34e089d7e. Problems discovered with readdir to Samba due to not accounting for header size properly with this change
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/sess.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 243d587..d3e6196 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -124,8 +124,7 @@ static __u32 cifs_ssetup_hdr(struct cifs_ses *ses, SESSION_SETUP_ANDX *pSMB)
/* that we use in next few lines */
/* Note that header is initialized to zero in header_assemble */
pSMB->req.AndXCommand = 0xFF;
- pSMB->req.MaxBufferSize = cpu_to_le16(min_t(u32, CIFSMaxBufSize - 4,
- USHRT_MAX));
+ pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf);
pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq);
pSMB->req.VcNumber = get_next_vcnum(ses);
OpenPOWER on IntegriCloud