summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg2013-02-08 22:59:00 +0100
committerJohannes Berg2013-02-11 18:44:55 +0100
commit112c31f095a7106fbb3ced0dae50aa9b36ac2662 (patch)
treefe4b07f03e97bbb9eb61e5b368fbf1445e6b2c45 /net/mac80211/mlme.c
parentmac80211: protect rx-path with spinlock (diff)
downloadkernel-qcow2-linux-112c31f095a7106fbb3ced0dae50aa9b36ac2662.tar.gz
kernel-qcow2-linux-112c31f095a7106fbb3ced0dae50aa9b36ac2662.tar.xz
kernel-qcow2-linux-112c31f095a7106fbb3ced0dae50aa9b36ac2662.zip
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>
Diffstat (limited to 'net/mac80211/mlme.c')
-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,
if (beacon)
mlme_dbg_ratelimited(sdata,
- "detected beacon loss from AP - sending probe request\n");
+ "detected beacon loss from AP - probing\n");
ieee80211_cqm_rssi_notify(&sdata->vif,
NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL);
@@ -2641,7 +2641,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) {
mlme_dbg_ratelimited(sdata,
- "cancelling probereq poll due to a received beacon\n");
+ "cancelling AP probe due to a received beacon\n");
mutex_lock(&local->mtx);
ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
ieee80211_run_deferred_scan(local);