Commit ccb14354 authored by John W. Linville's avatar John W. Linville
Browse files

Revert "nl80211/mac80211: Report signal average" 



This reverts commit 86107fd1.

This patch inadvertantly changed the userland ABI.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f8afa42b

include/linux/nl80211.h

+0 −2
Original line number Diff line number Diff line
@@ -1161,7 +1161,6 @@ 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)
@@ -1179,7 +1178,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ 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,
@@ -440,7 +439,6 @@ 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,

};



/**
@@ -487,7 +485,6 @@ 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
@@ -508,7 +505,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 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

+1 −2
Original line number Diff line number Diff line
@@ -343,9 +343,8 @@ 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 | STATION_INFO_SIGNAL_AVG;

		sinfo->filled |= STATION_INFO_SIGNAL;

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

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

	}



	sinfo->txrate.flags = 0;

net/mac80211/rx.c

+0 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,6 @@ 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