From: Steve French <smfrench@gmail.com>
Date: Tue, 2 May 2017 18:35:20 +0000 (-0500)
Subject: Set unicode flag on cifs echo request to avoid Mac error
X-Git-Tag: v4.12-rc1~75^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=26c9cb668c7fbf9830516b75d8bee70b699ed449;p=karo-tx-linux.git

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>
---

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;