mac80211: remove last_beacon/ave_beacon debugfs files

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

These file aren't really useful:
- if per beacon data is required then you need to use
radiotap or similar anyway, debugfs won't help much
- average beacon signal is reported in station info in
nl80211 and can be looked up with iw

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Johannes Berg 10 years ago 8e0d7fe0 c85fb53c

-16

3 changed files

expand all

net

mac80211

debugfs_netdev.c

ieee80211_i.h

mlme.c

-12

net/mac80211/debugfs_netdev.c

··· 114 114 return scnprintf(buf, buflen, "%pM\n", sdata->field); \ 115 115 } 116 116 117 - #define IEEE80211_IF_FMT_DEC_DIV_16(name, field) \ 118 - static ssize_t ieee80211_if_fmt_##name( \ 119 - const struct ieee80211_sub_if_data *sdata, \ 120 - char *buf, int buflen) \ 121 - { \ 122 - return scnprintf(buf, buflen, "%d\n", sdata->field / 16); \ 123 - } 124 - 125 117 #define IEEE80211_IF_FMT_JIFFIES_TO_MS(name, field) \ 126 118 static ssize_t ieee80211_if_fmt_##name( \ 127 119 const struct ieee80211_sub_if_data *sdata, \ ··· 239 247 /* STA attributes */ 240 248 IEEE80211_IF_FILE(bssid, u.mgd.bssid, MAC); 241 249 IEEE80211_IF_FILE(aid, u.mgd.aid, DEC); 242 - IEEE80211_IF_FILE(last_beacon, u.mgd.last_beacon_signal, DEC); 243 - IEEE80211_IF_FILE(ave_beacon, u.mgd.ave_beacon_signal, DEC_DIV_16); 244 250 IEEE80211_IF_FILE(beacon_timeout, u.mgd.beacon_timeout, JIFFIES_TO_MS); 245 251 246 252 static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata, ··· 624 634 { 625 635 DEBUGFS_ADD(bssid); 626 636 DEBUGFS_ADD(aid); 627 - DEBUGFS_ADD(last_beacon); 628 - DEBUGFS_ADD(ave_beacon); 629 637 DEBUGFS_ADD(beacon_timeout); 630 638 DEBUGFS_ADD_MODE(smps, 0600); 631 639 DEBUGFS_ADD_MODE(tkip_mic_test, 0200);

-3

net/mac80211/ieee80211_i.h

··· 490 490 491 491 s16 p2p_noa_index; 492 492 493 - /* Signal strength from the last Beacon frame in the current BSS. */ 494 - int last_beacon_signal; 495 - 496 493 /* 497 494 * Weighted average of the signal strength from Beacon frames in the 498 495 * current BSS. This is in units of 1/16 of the signal unit to maintain

-1

net/mac80211/mlme.c

··· 3364 3364 bssid = ifmgd->associated->bssid; 3365 3365 3366 3366 /* Track average RSSI from the Beacon frames of the current AP */ 3367 - ifmgd->last_beacon_signal = rx_status->signal; 3368 3367 if (ifmgd->flags & IEEE80211_STA_RESET_SIGNAL_AVE) { 3369 3368 ifmgd->flags &= ~IEEE80211_STA_RESET_SIGNAL_AVE; 3370 3369 ifmgd->ave_beacon_signal = rx_status->signal * 16;