cifs: Simplify SMB2 and SMB311 dependencies

BugLink: http://bugs.launchpad.net/bugs/1670508
* CIFS_SMB2 depends on CIFS, which depends on INET and selects NLS. So
  these dependencies do not need to be repeated for CIFS_SMB2.
* CIFS_SMB311 depends on CIFS_SMB2, which depends on INET. So this
  dependency doesn't need to be repeated for CIFS_SMB311.

Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Steve French <sfrench@samba.org>
(cherry picked from commit c1ecea87471bbb614f8121e00e5787f363140365)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index e7b478b4998532231278ca1c07be4481c1951576..a439c17c85c49afbee809162d58070655ef1bf29 100644 (file)
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -169,8 +169,7 @@ config CIFS_NFSD_EXPORT
 
 config CIFS_SMB2
        bool "SMB2 and SMB3 network file system support"
-       depends on CIFS && INET
-       select NLS
+       depends on CIFS
        select KEYS
        select FSCACHE
        select DNS_RESOLVER
@@ -194,7 +193,7 @@ config CIFS_SMB2
 
 config CIFS_SMB311
        bool "SMB3.1.1 network file system support (Experimental)"
-       depends on CIFS_SMB2 && INET
+       depends on CIFS_SMB2
 
        help
          This enables experimental support for the newest, SMB3.1.1, dialect.