Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a9f8d0 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move station statistics into sub-structs 



Group station statistics by where they're (mostly) updated
(TX, RX and TX-status) and group them into sub-structs of
the struct sta_info.

Also rename the variables since the grouping now makes it
obvious where they belong.

This makes it easier to identify where the statistics are
updated in the code, and thus easier to think about them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 976bd9ef

net/mac80211/debugfs_sta.c

+3 −3
Original line number Diff line number Diff line
@@ -366,9 +366,9 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) 
	DEBUGFS_ADD(ht_capa);

	DEBUGFS_ADD(vht_capa);



	DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates);

	DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments);

	DEBUGFS_ADD_COUNTER(tx_filtered, tx_filtered_count);

	DEBUGFS_ADD_COUNTER(rx_duplicates, rx_stats.num_duplicates);

	DEBUGFS_ADD_COUNTER(rx_fragments, rx_stats.fragments);

	DEBUGFS_ADD_COUNTER(tx_filtered, status_stats.filtered);



	if (sizeof(sta->driver_buffered_tids) == sizeof(u32))

		debugfs_create_x32("driver_buffered_tids", 0400,

net/mac80211/ethtool.c

+13 −13
Original line number Diff line number Diff line
@@ -79,17 +79,17 @@ static void ieee80211_get_stats(struct net_device *dev, 


#define ADD_STA_STATS(sta)					\

	do {							\

		data[i++] += sta->rx_packets;		\

		data[i++] += sta->rx_bytes;		\

		data[i++] += sta->num_duplicates;	\

		data[i++] += sta->rx_fragments;		\

		data[i++] += sta->rx_dropped;		\

		data[i++] += sta->rx_stats.packets;		\

		data[i++] += sta->rx_stats.bytes;		\

		data[i++] += sta->rx_stats.num_duplicates;	\

		data[i++] += sta->rx_stats.fragments;		\

		data[i++] += sta->rx_stats.dropped;		\

								\

		data[i++] += sinfo.tx_packets;			\

		data[i++] += sinfo.tx_bytes;			\

		data[i++] += sta->tx_filtered_count;	\

		data[i++] += sta->tx_retry_failed;	\

		data[i++] += sta->tx_retry_count;	\

		data[i++] += sta->status_stats.filtered;	\

		data[i++] += sta->status_stats.retry_failed;	\

		data[i++] += sta->status_stats.retry_count;	\

	} while (0)



	/* For Managed stations, find the single station based on BSSID

net/mac80211/ibss.c

+7 −6
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, const u8 *bssid, 
		return NULL;

	}



	sta->last_rx = jiffies;

	sta->rx_stats.last_rx = jiffies;



	/* make sure mandatory rates are always added */

	sband = local->hw.wiphy->bands[band];
@@ -669,7 +669,8 @@ static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata) 


	list_for_each_entry_rcu(sta, &local->sta_list, list) {

		if (sta->sdata == sdata &&

		    time_after(sta->last_rx + IEEE80211_IBSS_MERGE_INTERVAL,

		    time_after(sta->rx_stats.last_rx +

			       IEEE80211_IBSS_MERGE_INTERVAL,

			       jiffies)) {

			active++;

			break;
@@ -1235,7 +1236,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata, 
	if (!sta)

		return;



	sta->last_rx = jiffies;

	sta->rx_stats.last_rx = jiffies;



	/* make sure mandatory rates are always added */

	sband = local->hw.wiphy->bands[band];
@@ -1253,7 +1254,7 @@ static void ieee80211_ibss_sta_expire(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta, *tmp;

	unsigned long exp_time = IEEE80211_IBSS_INACTIVITY_LIMIT;

	unsigned long exp_rsn_time = IEEE80211_IBSS_RSN_INACTIVITY_LIMIT;

	unsigned long exp_rsn = IEEE80211_IBSS_RSN_INACTIVITY_LIMIT;



	mutex_lock(&local->sta_mtx);
@@ -1261,8 +1262,8 @@ static void ieee80211_ibss_sta_expire(struct ieee80211_sub_if_data *sdata) 
		if (sdata != sta->sdata)

			continue;



		if (time_after(jiffies, sta->last_rx + exp_time) ||

		    (time_after(jiffies, sta->last_rx + exp_rsn_time) &&

		if (time_after(jiffies, sta->rx_stats.last_rx + exp_time) ||

		    (time_after(jiffies, sta->rx_stats.last_rx + exp_rsn) &&

		     sta->sta_state != IEEE80211_STA_AUTHORIZED)) {

			sta_dbg(sta->sdata, "expiring inactive %sSTA %pM\n",

				sta->sta_state != IEEE80211_STA_AUTHORIZED ?

net/mac80211/mesh_hwmp.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, 
	if (sta->mesh->fail_avg >= 100)

		return MAX_METRIC;



	sta_set_rate_info_tx(sta, &sta->last_tx_rate, &rinfo);

	sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate, &rinfo);

	rate = cfg80211_calculate_bitrate(&rinfo);

	if (WARN_ON(!rate))

		return MAX_METRIC;

net/mac80211/mesh_plink.c

+4 −2
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ static bool rssi_threshold_check(struct ieee80211_sub_if_data *sdata, 
{

	s32 rssi_threshold = sdata->u.mesh.mshcfg.rssi_threshold;

	return rssi_threshold == 0 ||

	       (sta && (s8) -ewma_signal_read(&sta->avg_signal) > rssi_threshold);

	       (sta &&

		(s8)-ewma_signal_read(&sta->rx_stats.avg_signal) >

						rssi_threshold);

}



/**
@@ -390,7 +392,7 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, 
	rates = ieee80211_sta_get_rates(sdata, elems, band, &basic_rates);



	spin_lock_bh(&sta->mesh->plink_lock);

	sta->last_rx = jiffies;

	sta->rx_stats.last_rx = jiffies;



	/* rates and capabilities don't change during peering */

	if (sta->mesh->plink_state == NL80211_PLINK_ESTAB &&