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

Commit 40d9a38a authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use DECLARE_EWMA 



Instead of using the out-of-line average calculation, use the new
DECLARE_EWMA() macro to declare a signal EWMA, and use that.

This actually *reduces* the code size slightly (on x86-64) while
also reducing the station info size by 80 bytes.

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

net/mac80211/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config MAC80211 
	select CRYPTO_CCM

	select CRYPTO_GCM

	select CRC32

	select AVERAGE

	---help---

	  This option enables the hardware independent IEEE 802.11

	  networking stack.

net/mac80211/mesh_plink.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 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_read(&sta->avg_signal) > rssi_threshold);

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

}



/**

net/mac80211/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -1428,7 +1428,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 
	sta->rx_bytes += rx->skb->len;

	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {

		sta->last_signal = status->signal;

		ewma_add(&sta->avg_signal, -status->signal);

		ewma_signal_add(&sta->avg_signal, -status->signal);

	}



	if (status->chains) {
@@ -1440,7 +1440,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 
				continue;



			sta->chain_signal_last[i] = signal;

			ewma_add(&sta->chain_signal_avg[i], -signal);

			ewma_signal_add(&sta->chain_signal_avg[i], -signal);

		}

	}

net/mac80211/sta_info.c

+5 −4
Original line number Diff line number Diff line
@@ -341,9 +341,9 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata, 


	ktime_get_ts(&uptime);

	sta->last_connected = uptime.tv_sec;

	ewma_init(&sta->avg_signal, 1024, 8);

	ewma_signal_init(&sta->avg_signal);

	for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)

		ewma_init(&sta->chain_signal_avg[i], 1024, 8);

		ewma_signal_init(&sta->chain_signal_avg[i]);



	if (local->ops->wake_tx_queue) {

		void *txq_data;
@@ -1896,7 +1896,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
		}



		if (!(sinfo->filled & BIT(NL80211_STA_INFO_SIGNAL_AVG))) {

			sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);

			sinfo->signal_avg =

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

			sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);

		}

	}
@@ -1911,7 +1912,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
		for (i = 0; i < ARRAY_SIZE(sinfo->chain_signal); i++) {

			sinfo->chain_signal[i] = sta->chain_signal_last[i];

			sinfo->chain_signal_avg[i] =

				(s8) -ewma_read(&sta->chain_signal_avg[i]);

				(s8) -ewma_signal_read(&sta->chain_signal_avg[i]);

		}

	}

net/mac80211/sta_info.h

+4 −2
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ struct mesh_sta { 
	unsigned int fail_avg;

};



DECLARE_EWMA(signal, 1024, 8)



/**

 * struct sta_info - STA information

 *
@@ -462,12 +464,12 @@ struct sta_info { 
	unsigned long rx_fragments;

	unsigned long rx_dropped;

	int last_signal;

	struct ewma avg_signal;

	struct ewma_signal avg_signal;

	int last_ack_signal;



	u8 chains;

	s8 chain_signal_last[IEEE80211_MAX_CHAINS];

	struct ewma chain_signal_avg[IEEE80211_MAX_CHAINS];

	struct ewma_signal chain_signal_avg[IEEE80211_MAX_CHAINS];



	/* Plus 1 for non-QoS frames */

	__le16 last_seq_ctrl[IEEE80211_NUM_TIDS + 1];