1 files changed, 9 insertions, 3 deletions

diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
index 81df2bf8e75a..6df9dadba647 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@ -26,7 +26,8 @@
 
 #ifdef CONFIG_CIFS_WEAK_PW_HASH
 #define LANMAN_PROT 0
-#define CIFS_PROT   1
+#define LANMAN2_PROT 1
+#define CIFS_PROT   2
 #else
 #define CIFS_PROT   0
 #endif
@@ -408,6 +409,8 @@ typedef struct negotiate_req {
 
 /* Dialect index is 13 for LANMAN */
 
+#define MIN_TZ_ADJ (15 * 60) /* minimum grid for timezones in seconds */
+
 typedef struct lanman_neg_rsp {
         struct smb_hdr hdr;     /* wct = 13 */
         __le16 DialectIndex;
@@ -417,7 +420,10 @@ typedef struct lanman_neg_rsp {
         __le16 MaxNumberVcs;
         __le16 RawMode;
         __le32 SessionKey;
-        __le32 ServerTime;
+        struct {
+                __le16 Time;
+                __le16 Date;
+        } __attribute__((packed)) SrvTime;
         __le16 ServerTimeZone;
         __le16 EncryptionKeyLength;
         __le16 Reserved;
@@ -674,7 +680,7 @@ typedef union smb_com_tree_disconnect {	/* as an altetnative can use flag on
 typedef struct smb_com_close_req {
         struct smb_hdr hdr;     /* wct = 3 */
         __u16 FileID;
-        __u32 LastWriteTime;    /* should be zero */
+        __u32 LastWriteTime;    /* should be zero or -1 */
         __u16 ByteCount;        /* 0 */
 } __attribute__((packed)) CLOSE_REQ;