diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index 3761d3ad6088..577f0ddede90 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -450,7 +450,6 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) seq_puts(m, "Display Internal CIFS Data Structures for Debugging\n" "---------------------------------------------------\n"); - seq_printf(m, "CIFS Version %s\n", CIFS_VERSION); seq_printf(m, "Features:"); #ifdef CONFIG_CIFS_DFS_UPCALL seq_printf(m, " DFS"); diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c index ac9e3155c3f7..5d7c786d1801 100644 --- a/fs/smb/client/cifsfs.c +++ b/fs/smb/client/cifsfs.c @@ -2249,7 +2249,6 @@ MODULE_LICENSE("GPL"); /* combination of LGPL + GPL source behaves as GPL */ MODULE_DESCRIPTION ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and " "also older servers complying with the SNIA CIFS Specification)"); -MODULE_VERSION(CIFS_VERSION); MODULE_SOFTDEP("nls"); MODULE_SOFTDEP("aes"); MODULE_SOFTDEP("aead2"); diff --git a/fs/smb/client/cifsfs.h b/fs/smb/client/cifsfs.h index e3d820c9778b..0b064236b4dc 100644 --- a/fs/smb/client/cifsfs.h +++ b/fs/smb/client/cifsfs.h @@ -167,7 +167,4 @@ char *cifs_silly_fullpath(struct dentry *dentry); extern const struct export_operations cifs_export_ops; #endif /* CONFIG_CIFS_NFSD_EXPORT */ -/* when changing internal version - update following two lines at same time */ -#define SMB3_PRODUCT_BUILD 61 -#define CIFS_VERSION "2.61" #endif /* _CIFSFS_H */ diff --git a/fs/smb/client/ntlmssp.h b/fs/smb/client/ntlmssp.h index be0365f08396..7d68153985f8 100644 --- a/fs/smb/client/ntlmssp.h +++ b/fs/smb/client/ntlmssp.h @@ -93,7 +93,7 @@ typedef struct _NEGOTIATE_MESSAGE { struct ntlmssp_version { __u8 ProductMajorVersion; __u8 ProductMinorVersion; - __le16 ProductBuild; /* we send the cifs.ko module version here */ + __le16 ProductBuild; /* we send the kernel sublevel here */ __u8 Reserved[3]; __u8 NTLMRevisionCurrent; /* currently 0x0F */ } __packed; diff --git a/fs/smb/client/sess.c b/fs/smb/client/sess.c index 0ab3f37d4809..fc105308226c 100644 --- a/fs/smb/client/sess.c +++ b/fs/smb/client/sess.c @@ -890,7 +890,7 @@ int build_ntlmssp_smb3_negotiate_blob(unsigned char **pbuffer, sec_blob->Version.ProductMajorVersion = LINUX_VERSION_MAJOR; sec_blob->Version.ProductMinorVersion = LINUX_VERSION_PATCHLEVEL; - sec_blob->Version.ProductBuild = cpu_to_le16(SMB3_PRODUCT_BUILD); + sec_blob->Version.ProductBuild = cpu_to_le16(LINUX_VERSION_SUBLEVEL); sec_blob->Version.NTLMRevisionCurrent = NTLMSSP_REVISION_W2K3; tmp = *pbuffer + sizeof(struct negotiate_message); @@ -956,7 +956,7 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer, sec_blob->Version.ProductMajorVersion = LINUX_VERSION_MAJOR; sec_blob->Version.ProductMinorVersion = LINUX_VERSION_PATCHLEVEL; - sec_blob->Version.ProductBuild = cpu_to_le16(SMB3_PRODUCT_BUILD); + sec_blob->Version.ProductBuild = cpu_to_le16(LINUX_VERSION_SUBLEVEL); sec_blob->Version.NTLMRevisionCurrent = NTLMSSP_REVISION_W2K3; tmp = *pbuffer + sizeof(AUTHENTICATE_MESSAGE);