summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2013-11-18 18:06:46 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 16:50:14 +0100
commit12b5f34d2d5934e998975bbae4e29f81d94052f6 (patch)
treeef54568f79d15e10efd0f2b28dcd27eeeb3e3f08 /net
parentmac80211_hwsim: Fix bcn_en_iter to use atomic iteration (diff)
downloadlinux-12b5f34d2d5934e998975bbae4e29f81d94052f6.tar.xz
linux-12b5f34d2d5934e998975bbae4e29f81d94052f6.zip
mac80211: fix connection polling
Commit 392b9ff ("mac80211: change beacon/connection polling") removed the IEEE80211_STA_BEACON_POLL flag. However, it accidentally removed the setting of IEEE80211_STA_CONNECTION_POLL, making the connection polling completely useless (the flag is always clear, so the result is never being checked). Fix it. Signed-off-by: Eliad Peller <eliad@wizery.com> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-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)