summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-09-15 09:22:35 -0700
committerColin Cross <ccross@android.com>2012-04-09 13:57:55 -0700
commitc6a6a521e91ea230929714b3cb448c901923956f (patch)
treed41722e39a2843d8c94de5056f8d13276c29a114 /net/wireless
parent998ba94954b283f1c39a3b3d54653e8cf2f3d118 (diff)
net: wireless: Add CFG80211_ALLOW_RECONNECT option
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/Kconfig11
-rw-r--r--net/wireless/sme.c2
2 files changed, 13 insertions, 0 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 2e4444fedbe..8db24da2e2c 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -160,3 +160,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 f7e937ff897..7eef5b4144c 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -767,8 +767,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);