Merge tag 'mvebu-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclem...

[linux-2.6-microblaze.git] / fs / cifs / smb2pdu.h

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index a5c48b8..e9cac79 100644 (file)
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -13,7 +13,7 @@
 #define _SMB2PDU_H
 
 #include <net/sock.h>
-#include <cifsacl.h>
+#include "cifsacl.h"
 
 /*
  * Note that, due to trying to use names similar to the protocol specifications,
@@ -329,7 +329,7 @@ struct smb2_neg_context {
        __le16  ContextType;
        __le16  DataLength;
        __le32  Reserved;
-       /* Followed by array of data */
+       /* Followed by array of data. NOTE: some servers require padding to 8 byte boundary */
 } __packed;
 
 #define SMB311_LINUX_CLIENT_SALT_SIZE                  32
@@ -394,6 +394,8 @@ struct smb2_compression_capabilities_context {
        __u16   Padding;
        __u32   Flags;
        __le16  CompressionAlgorithms[3];
+       __u16   Pad;  /* Some servers require pad to DataLen multiple of 8 */
+       /* Check if pad needed */
 } __packed;
 
 /*
@@ -420,6 +422,7 @@ struct smb2_transport_capabilities_context {
        __le16  DataLength;
        __u32   Reserved;
        __le32  Flags;
+       __u32   Pad;
 } __packed;
 
 /*
@@ -458,6 +461,7 @@ struct smb2_signing_capabilities {
        __u32   Reserved;
        __le16  SigningAlgorithmCount;
        __le16  SigningAlgorithms[];
+       /*  Followed by padding to 8 byte boundary (required by some servers) */
 } __packed;
 
 #define POSIX_CTXT_DATA_LEN    16