net: wireless: Add CFG80211_ALLOW_RECONNECT option

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 16d08b39921071479456e2033c5e371d381175b7..4c602d100480cd624c1fd89567bb190e657fa6c1 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -166,3 +166,14 @@ config LIB80211_DEBUG
          from lib80211.
 
          If unsure, say N.
+
+config CFG80211_ALLOW_RECONNECT
+       bool "Allow reconnect while already connected"
+       depends on CFG80211
+       default n
+       help
+         cfg80211 stack doesn't allow to connect if you are already
+         connected. This option allows to make a connection in this case.
+
+         Select this option ONLY for wlan drivers that are specifically
+         built for such purposes.

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 3ed35c345caed81966eb0ad52b7e1a4b350ec473..c260e39ea05564eca3d24d5d2d974dadadc24a16 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -785,8 +785,10 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
 
        ASSERT_WDEV_LOCK(wdev);
 
+#ifndef CONFIG_CFG80211_ALLOW_RECONNECT
        if (wdev->sme_state != CFG80211_SME_IDLE)
                return -EALREADY;
+#endif
 
        if (WARN_ON(wdev->connect_keys)) {
                kfree(wdev->connect_keys);