1 files changed, 4 insertions, 1 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index aaf151cb5822..d2ec806a4f32 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo,
                         pSesInfo->server->secMode,
                         pSesInfo->server->capabilities,
                         pSesInfo->server->timeZone));
+#ifdef CONFIG_CIFS_EXPERIMENTAL
                 if(experimEnabled > 1)
                         rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,
                                             &ntlmv2_flag, nls_info);    
-                else if (extended_security
+                else
+#endif
+                if (extended_security
                                 && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)
                                 && (pSesInfo->server->secType == NTLMSSP)) {
                         cFYI(1, ("New style sesssetup"));