diff options
| author | John W. Linville | 2013-12-05 15:29:56 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-12-05 15:29:56 +0100 |
| commit | aa489f0f268595bd33d9649030bd1a43c28927a0 (patch) | |
| tree | 598cb96d4b22749e07116cb4006d71fb5a5704ea /net/mac80211/mlme.c | |
| parent | Merge branch 'cxgb4' (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.gz kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.xz kernel-qcow2-linux-aa489f0f268595bd33d9649030bd1a43c28927a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
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) |