| From e88c4d2e63f96436b3a59db5901448cbb2b866a8 Mon Sep 17 00:00:00 2001 |
| From: Steve French <smfrench@gmail.com> |
| Date: Tue, 2 May 2017 13:35:20 -0500 |
| Subject: [PATCH] Set unicode flag on cifs echo request to avoid Mac error |
| |
| commit 26c9cb668c7fbf9830516b75d8bee70b699ed449 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c |
| index 78046051bbbc..94bc95b4a970 100644 |
| --- a/fs/cifs/cifssmb.c |
| +++ b/fs/cifs/cifssmb.c |
| @@ -717,6 +717,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; |
| -- |
| 2.12.0 |
| |
