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

Commit 86107fd1 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

nl80211/mac80211: Report signal average 



Extend nl80211 to report an exponential weighted moving average (EWMA) of the
signal value. Since the signal value usually fluctuates between different
packets, an average can be more useful than the value of the last packet.

This uses the recently added generic EWMA library function.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eef39bef

include/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,7 @@ enum nl80211_rate_info { 
 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)

 * @NL80211_STA_INFO_SIGNAL_AVG: signal strength average (u8, dBm)

 * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute

 * 	containing info as possible, see &enum nl80211_sta_info_txrate.

 * @NL80211_STA_INFO_RX_PACKETS: total received packet (u32, from this station)
@@ -1178,6 +1179,7 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_PLID,

	NL80211_STA_INFO_PLINK_STATE,

	NL80211_STA_INFO_SIGNAL,

	NL80211_STA_INFO_SIGNAL_AVG,

	NL80211_STA_INFO_TX_BITRATE,

	NL80211_STA_INFO_RX_PACKETS,

	NL80211_STA_INFO_TX_PACKETS,

include/net/cfg80211.h

+4 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ struct station_parameters { 
 * @STATION_INFO_TX_RETRIES: @tx_retries filled

 * @STATION_INFO_TX_FAILED: @tx_failed filled

 * @STATION_INFO_RX_DROP_MISC: @rx_dropped_misc filled

 * @STATION_INFO_SIGNAL_AVG: @signal_avg filled

 */

enum station_info_flags {

	STATION_INFO_INACTIVE_TIME	= 1<<0,
@@ -439,6 +440,7 @@ enum station_info_flags { 
	STATION_INFO_TX_RETRIES		= 1<<10,

	STATION_INFO_TX_FAILED		= 1<<11,

	STATION_INFO_RX_DROP_MISC	= 1<<12,

	STATION_INFO_SIGNAL_AVG		= 1<<13,

};



/**
@@ -485,6 +487,7 @@ struct rate_info { 
 * @plid: mesh peer link id

 * @plink_state: mesh peer link state

 * @signal: signal strength of last received packet in dBm

 * @signal_avg: signal strength average in dBm

 * @txrate: current unicast bitrate to this station

 * @rx_packets: packets received from this station

 * @tx_packets: packets transmitted to this station
@@ -505,6 +508,7 @@ struct station_info { 
	u16 plid;

	u8 plink_state;

	s8 signal;

	s8 signal_avg;

	struct rate_info txrate;

	u32 rx_packets;

	u32 tx_packets;

net/mac80211/Kconfig

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

	select CRYPTO_AES

	select CRC32

	select AVERAGE

	---help---

	  This option enables the hardware independent IEEE 802.11

	  networking stack.

net/mac80211/cfg.c

+2 −1
Original line number Diff line number Diff line
@@ -343,8 +343,9 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 


	if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||

	    (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {

		sinfo->filled |= STATION_INFO_SIGNAL;

		sinfo->filled |= STATION_INFO_SIGNAL | STATION_INFO_SIGNAL_AVG;

		sinfo->signal = (s8)sta->last_signal;

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

	}



	sinfo->txrate.flags = 0;

net/mac80211/rx.c

+1 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 
	sta->rx_fragments++;

	sta->rx_bytes += rx->skb->len;

	sta->last_signal = status->signal;

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



	/*

	 * Change STA power saving mode only at the end of a frame