Skip to content

Commit 89d2300

Browse files
smfrenchgregkh
authored andcommitted
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7aad381 commit 89d2300

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

fs/cifs/cifssmb.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,9 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
717717
if (rc)
718718
return rc;
719719

720+
if (server->capabilities & CAP_UNICODE)
721+
smb->hdr.Flags2 |= SMBFLG2_UNICODE;
722+
720723
/* set up echo request */
721724
smb->hdr.Tid = 0xffff;
722725
smb->hdr.WordCount = 1;

0 commit comments

Comments
 (0)