summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2017-05-02 13:35:20 -0500
committerSteve French <smfrench@gmail.com>2017-05-02 14:57:34 -0500
commit26c9cb668c7fbf9830516b75d8bee70b699ed449 (patch)
tree0620b803338e7c648c776865c0dad919d574f53f /fs/cifs
parentc610c4b619e53494d9c512fa0333e28c732e976f (diff)
downloadlinux-stable-26c9cb668c7fbf9830516b75d8bee70b699ed449.tar.gz
linux-stable-26c9cb668c7fbf9830516b75d8bee70b699ed449.tar.bz2
linux-stable-26c9cb668c7fbf9830516b75d8bee70b699ed449.zip
Set unicode flag on cifs echo request to avoid Mac error
Mac requires the unicode flag to be set for cifs, even for the smb echo request (which doesn't have strings). Without this Mac rejects the periodic echo requests (when mounting with cifs) that we use to check if server is down Signed-off-by: Steve French <smfrench@gmail.com> CC: Stable <stable@vger.kernel.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifssmb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5d21f00ae341..205fd94f52fd 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -718,6 +718,9 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
if (rc)
return rc;
+ if (server->capabilities & CAP_UNICODE)
+ smb->hdr.Flags2 |= SMBFLG2_UNICODE;
+
/* set up echo request */
smb->hdr.Tid = 0xffff;
smb->hdr.WordCount = 1;