summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-10-18 12:30:02 -0700
committerNitin Garg <nitin.garg@freescale.com>2014-04-21 22:34:46 -0500
commitfb98752b861ab9491f132100c18f8c696279e818 (patch)
tree19c90e809701337979b5420a99f535c5359e1939 /net
parentdb6bb04a4c9ef9870a9e98b066e419cff550d39f (diff)
net: wireless: Fix CFG80211_ALLOW_RECONNECT option for disconnect
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'net')
-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);