summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-10-18 12:30:02 -0700
committerArve Hjønnevåg <arve@android.com>2013-07-01 13:40:34 -0700
commit5b485bf6b930ce59afde5fe45636691619c45afc (patch)
treee54d66dc26d91f75206177ef5a8a81e13571b8b7 /net/wireless
parentb6a4d75f2a32e5aa5c0be999ffd1c9fd35091b70 (diff)
net: wireless: Fix CFG80211_ALLOW_RECONNECT option for disconnect
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/sme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index c260e39ea055..49ad81dfae55 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -707,8 +707,10 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,
wdev->iftype != NL80211_IFTYPE_P2P_CLIENT))
return;
+#ifndef CONFIG_CFG80211_ALLOW_RECONNECT
if (wdev->sme_state != CFG80211_SME_CONNECTED)
return;
+#endif
if (wdev->current_bss) {
cfg80211_unhold_bss(wdev->current_bss);