aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-10-18 12:30:02 -0700
committerDmitry Shmidt <dimitrysh@google.com>2011-10-18 12:30:02 -0700
commitfdfcbc682a48c9ebf63c3bf6576d610544a4f693 (patch)
tree781177e62707e17270aff9c4c4d80e5deb68daf1 /net/wireless
parent2cc01eb245d167c4769dd7de0250ec8e8d3bff98 (diff)
downloadkernel_samsung_espresso10-fdfcbc682a48c9ebf63c3bf6576d610544a4f693.zip
kernel_samsung_espresso10-fdfcbc682a48c9ebf63c3bf6576d610544a4f693.tar.gz
kernel_samsung_espresso10-fdfcbc682a48c9ebf63c3bf6576d610544a4f693.tar.bz2
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 f8d266a..81e6747 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -659,8 +659,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);