summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-12-02 13:53:56 +0800
committerAndy Green <andy.green@linaro.org>2011-12-02 13:53:56 +0800
commita9473c7ec7d3530f18c63fe9fc197e304c45b500 (patch)
treef1535a7d1f17e94bece672390d6af98701d4f9bd /net
parent20011a5a131ded5a0a443590256c399ddb28afc4 (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 9541631e66b..f2be504c7bb 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -667,8 +667,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);