Add Get/Set Integrity Information structure definitions

[mirror_ubuntu-bionic-kernel.git] / fs / cifs / smb2pdu.c

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 54cbe19d9c0871a1bb47a17edfc1d414cb383b9f..0479e3c87a2c4d45220acb7cc2f1dbe7f792ffeb 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -393,8 +393,12 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
                cifs_dbg(FYI, "negotiated smb3.0 dialect\n");
        else if (rsp->DialectRevision == cpu_to_le16(SMB302_PROT_ID))
                cifs_dbg(FYI, "negotiated smb3.02 dialect\n");
+#ifdef CONFIG_CIFS_SMB311
+       else if (rsp->DialectRevision == cpu_to_le16(SMB311_PROT_ID))
+               cifs_dbg(FYI, "negotiated smb3.1.1 dialect\n");
+#endif /* SMB311 */
        else {
-               cifs_dbg(VFS, "Illegal dialect returned by server %d\n",
+               cifs_dbg(VFS, "Illegal dialect returned by server 0x%x\n",
                         le16_to_cpu(rsp->DialectRevision));
                rc = -EIO;
                goto neg_exit;
@@ -572,7 +576,7 @@ ssetup_ntlmssp_authenticate:
                return rc;
 
        req->hdr.SessionId = 0; /* First session, not a reauthenticate */
-       req->VcNumber = 0; /* MBZ */
+       req->Flags = 0; /* MBZ */
        /* to enable echos and oplocks */
        req->hdr.CreditRequest = cpu_to_le16(3);