Commit 8e0d7fe0 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove last_beacon/ave_beacon debugfs files 



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: default avatarJohannes Berg <johannes.berg@intel.com>
parent c85fb53c

net/mac80211/debugfs_netdev.c

+0 −12
Original line number Diff line number Diff line
@@ -114,14 +114,6 @@ static ssize_t ieee80211_if_fmt_##name( \ 
	return scnprintf(buf, buflen, "%pM\n", sdata->field);		\

}



#define IEEE80211_IF_FMT_DEC_DIV_16(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", 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,			\
@@ -247,8 +239,6 @@ IEEE80211_IF_FILE_R(hw_queues); 
/* STA attributes */

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,
@@ -634,8 +624,6 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata) 
{

	DEBUGFS_ADD(bssid);

	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);

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -490,9 +490,6 @@ struct ieee80211_if_managed { 


	s16 p2p_noa_index;



	/* Signal strength from the last Beacon frame in the current BSS. */

	int last_beacon_signal;



	/*

	 * Weighted average of the signal strength from Beacon frames in the

	 * current BSS. This is in units of 1/16 of the signal unit to maintain

net/mac80211/mlme.c

+0 −1
Original line number Diff line number Diff line
@@ -3364,7 +3364,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
	bssid = ifmgd->associated->bssid;



	/* Track average RSSI from the Beacon frames of the current AP */

	ifmgd->last_beacon_signal = rx_status->signal;

	if (ifmgd->flags & IEEE80211_STA_RESET_SIGNAL_AVE) {

		ifmgd->flags &= ~IEEE80211_STA_RESET_SIGNAL_AVE;

		ifmgd->ave_beacon_signal = rx_status->signal * 16;

CRA Git | Maintained and supported by SUSTech CRA and CCSE