summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-09-15 09:22:35 -0700
committerNitin Garg <nitin.garg@freescale.com>2014-04-21 22:34:46 -0500
commitdb6bb04a4c9ef9870a9e98b066e419cff550d39f (patch)
tree5aa3810a9f71f25c82945b3efa033e13a49052ae /net
parentf6e53bb6a9502ecceb7f4f1f1669f11c684630dc (diff)
net: wireless: Add CFG80211_ALLOW_RECONNECT option
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net')
-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 16d08b399210..4c602d100480 100644
--- 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 3ed35c345cae..c260e39ea055 100644
--- 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);