aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-08 16:59:00 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 12:44:55 -0500
commit112c31f095a7106fbb3ced0dae50aa9b36ac2662 (patch)
treefe4b07f03e97bbb9eb61e5b368fbf1445e6b2c45
parentf9e124fbd8cbea974b5dc7e9dafddd17d21df7e2 (diff)
mac80211: fix AP beacon loss messages
The messages currently refer to probe request probes, but on some devices null data packets will be used instead. Make the messages more generic. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 15f2edd08a95..40ce00c6d4ca 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1746,7 +1746,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
1746 1746
1747 if (beacon) 1747 if (beacon)
1748 mlme_dbg_ratelimited(sdata, 1748 mlme_dbg_ratelimited(sdata,
1749 "detected beacon loss from AP - sending probe request\n"); 1749 "detected beacon loss from AP - probing\n");
1750 1750
1751 ieee80211_cqm_rssi_notify(&sdata->vif, 1751 ieee80211_cqm_rssi_notify(&sdata->vif,
1752 NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL); 1752 NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL);
@@ -2641,7 +2641,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
2641 2641
2642 if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) { 2642 if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) {
2643 mlme_dbg_ratelimited(sdata, 2643 mlme_dbg_ratelimited(sdata,
2644 "cancelling probereq poll due to a received beacon\n"); 2644 "cancelling AP probe due to a received beacon\n");
2645 mutex_lock(&local->mtx); 2645 mutex_lock(&local->mtx);
2646 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL; 2646 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
2647 ieee80211_run_deferred_scan(local); 2647 ieee80211_run_deferred_scan(local);