mac80211: Add beacon stats to debugfs.
PATCH v2 1/2 mac80211: Add beacon stats to debugfs.
From: Ben Greear <[email protected]>
Beacon-timeout and number of beacon loss events.
Signed-off-by Ben Greear <[email protected]>
---
Now against mac80211-next tree.
:100644 100644 ddb4268... 14abcf4... M net/mac80211/debugfs_netdev.c
:100644 100644 4f841fe... 44e201d... M net/mac80211/debugfs_sta.c
net/mac80211/debugfs_netdev.c | 11 +++++++++++ net/mac80211/debugfs_sta.c | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-)
net/mac80211/debugfs_netdev.c +11 -0
@@ -124,6 +124,15 @@ static ssize_t ieee80211_if_fmt_##name( \return scnprintf (buf, buflen,"%d\n" , sdata->field /16 ); \ } +#define IEEE80211_IF_FMT_JIFFIES_TO_MS (name, field) \ +static ssize_t ieee80211_if_fmt_##name( \ + const struct ieee80211_sub_if_data *sdata, \ + char *buf, int buflen) \ +{ \ + return scnprintf(buf, buflen, "%d\n", \ + jiffies_to_msecs(sdata->field)); \ +} +#define __IEEE80211_IF_FILE (name, _write) \ static ssize_t ieee80211_if_read_##name(struct file *file, \ char __user *userbuf, \
@@ -197,6 +206,7 @@ IEEE80211_IF_FILE(bssid, u.mgd.bssid, MAC);IEEE80211_IF_FILE (aid, u.mgd.aid,DEC );IEEE80211_IF_FILE (last_beacon, u.mgd.last_beacon_signal,DEC );IEEE80211_IF_FILE (ave_beacon, u.mgd.ave_beacon_signal,DEC_DIV_16 ); +IEEE80211_IF_FILE (beacon_timeout, u.mgd.beacon_timeout,JIFFIES_TO_MS );static int ieee80211_set_smps (struct ieee80211_sub_if_data *sdata,enum ieee80211_smps_mode smps_mode)
@@ -542,6 +552,7 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)DEBUGFS_ADD (aid);DEBUGFS_ADD (last_beacon);DEBUGFS_ADD (ave_beacon); +DEBUGFS_ADD (beacon_timeout);DEBUGFS_ADD_MODE (smps,0600 );DEBUGFS_ADD_MODE (tkip_mic_test,0200 );DEBUGFS_ADD_MODE (uapsd_queues,0600 );
net/mac80211/debugfs_sta.c +2 -0
@@ -54,6 +54,7 @@ STA_FILE(aid, sta.aid, D);STA_FILE (dev, sdata->name,S );STA_FILE (last_signal, last_signal,D );STA_FILE (last_ack_signal, last_ack_signal,D ); +STA_FILE (beacon_loss_count, beacon_loss_count,D );static ssize_t sta_flags_read (struct file *file,char __user *userbuf,size_t count,loff_t *ppos)
@@ -434,6 +435,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)DEBUGFS_ADD (agg_status);DEBUGFS_ADD (dev);DEBUGFS_ADD (last_signal); +DEBUGFS_ADD (beacon_loss_count);DEBUGFS_ADD (ht_capa);DEBUGFS_ADD (vht_capa);DEBUGFS_ADD (last_ack_signal);
Signature · 1 line
1.7.3.4
PATCH v2 2/2 mac80211: Be more careful about sending beacon-loss-events.
From: Ben Greear <[email protected]>
I don't think we should send the events unless it was actually a beacon that was lost...not just any probe of an AP.
Signed-off-by Ben Greear <[email protected]>
---
Now against mac80211-next tree.
:100644 100644 9958cb7... fe72749... M net/mac80211/mlme.c
net/mac80211/mlme.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
net/mac80211/mlme.c +5 -3
@@ -1978,13 +1978,15 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, goto out; } -if (beacon) +if (beacon) {mlme_dbg_ratelimited (sdata,"detected beacon loss from AP (missed %d beacons) - probing\n" , beacon_loss_count); -ieee80211_cqm_rssi_notify (&sdata->vif, -NL80211_CQM_RSSI_BEACON_LOSS_EVENT ,GFP_KERNEL ); +ieee80211_cqm_rssi_notify (&sdata->vif, +NL80211_CQM_RSSI_BEACON_LOSS_EVENT , +GFP_KERNEL ); + }/* * The driver/our work has already reported this event or the
Signature · 1 line
1.7.3.4
Johannes Berg
maintainerQuoted 3 lines · On Mon, 2013-03-25 at 11:19 -0700, [email protected] wrote:
From: Ben Greear <[email protected]>
Beacon-timeout and number of beacon loss events.
Both applied.
johannes