diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-09-15 09:22:35 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-08-10 15:48:04 -0400 |
| commit | fa41f67bc5d316d20f7c0e6b2159ec083cfc450b (patch) | |
| tree | 85681803d4c392eafe832ac2cdda2614a528fee0 /net | |
| parent | 0dc8ad99581ffad3e1bdfee2aa985b460b4a15e5 (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/Kconfig | 11 | ||||
| -rw-r--r-- | net/wireless/sme.c | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index fe4adb12b3ef..b96261efcfc8 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -167,3 +167,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 6f39cb808302..59e47f498c2b 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); |