diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-09 02:33:52 +0100 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-10-17 10:25:31 +0800 |
commit | 6f9d88d5204290b144bdd6fe333df9450a9aa160 (patch) | |
tree | b73ca9cfddace02f58ee51beda522b12278c242d | |
parent | 042cac8f7d35b83f6032aaab057973d53c983fdc (diff) |
net: wireless: Add CFG80211_ALLOW_RECONNECT option
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-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 1f1ef70f34f..8e2a668c923 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -159,3 +159,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 dec0fa28372..a346241e533 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -760,8 +760,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); |