---

yaml --- r: 92954 b: refs/heads/master c: ee4987a h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · c1fbad5 · c1fbad5
1 parent 145d80b
commit c1fbad5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36d99df2fb474222ab47fbe8ae7385661033223b
+refs/heads/master: ee4987ab5cc9d00be38cfeec90174229565211be
diff --git a/trunk/fs/cifs/cifspdu.h b/trunk/fs/cifs/cifspdu.h
@@ -1787,7 +1787,8 @@ typedef struct smb_com_transaction2_fnext_rsp_parms {
 #define SMB_QUERY_CIFS_UNIX_INFO    0x200
 #define SMB_QUERY_POSIX_FS_INFO     0x201
 #define SMB_QUERY_POSIX_WHO_AM_I    0x202
-#define SMB_QUERY_FS_PROXY          0x203 /* WAFS enabled. Returns structure
+#define SMB_REQUEST_TRANSPORT_ENCRYPTION 0x203
+#define SMB_QUERY_FS_PROXY          0x204 /* WAFS enabled. Returns structure
 					    FILE_SYSTEM__UNIX_INFO to tell
 					    whether new NTIOCTL available
 					    (0xACE) for WAN friendly SMB
@@ -2048,7 +2049,9 @@ typedef struct {
 #define CIFS_UNIX_LARGE_READ_CAP        0x00000040 /* support reads >128K (up
 						      to 0xFFFF00 */
 #define CIFS_UNIX_LARGE_WRITE_CAP       0x00000080
-#define CIFS_UNIX_PROXY_CAP             0x00000100 /* Proxy cap: 0xACE ioctl and
+#define CIFS_UNIX_TRANSPORT_ENCRYPTION_ 0x00000100 /* can do SPNEGO encrypt */
+#define CIFS_UNIX_TRANPSORT_ENCRYPTION  0x00000200 /* must do SPNEGO encrypt */
+#define CIFS_UNIX_PROXY_CAP             0x00000400 /* Proxy cap: 0xACE ioctl and
 						      QFS PROXY call */
 #ifdef CONFIG_CIFS_POSIX
 /* Can not set pathnames cap yet until we send new posix create SMB since