summaryrefslogtreecommitdiff
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-11-25 15:47:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-11-25 15:47:18 -0500
commitd5aedd7e1b2f024ced0486aeb730bc56875e5ac9 (patch)
tree8ba9d15789748952e5e02d7a8a4a8cda0e16ccfd /net/mac80211/mlme.c
parent517543fd72d577dde2ebd9505dc4abf26d589f9a (diff)
parent24d47300d118c5909a51b7270276d749cce150a2 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d7504ab61a34..b3a3ce316656 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1910,6 +1910,8 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
if (ifmgd->flags & IEEE80211_STA_CONNECTION_POLL)
already = true;
+ ifmgd->flags |= IEEE80211_STA_CONNECTION_POLL;
+
mutex_unlock(&sdata->local->mtx);
if (already)