Patch 4/4: Remove old stats variables from mac80211 structs.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
Index: wireless-dev/include/net/mac80211.h
===================================================================
--- wireless-dev.orig/include/net/mac80211.h
+++ wireless-dev/include/net/mac80211.h
@@ -227,8 +227,6 @@ struct ieee80211_rx_status {
int freq; /* receive frequency in Mhz */
int channel;
int phymode;
- int ssi;
- int signal; /* used as qual in statistics reporting */
int level; /* used in statistics reporting */
int qual; /* used in statistics reporting */
int noise;
@@ -544,9 +542,7 @@ struct ieee80211_hw {
int channel_change_time;
/* Maximum values for various statistics.
* Leave at 0 to indicate no support. Use negative numbers for dBm. */
- s8 max_rssi;
s8 max_level;
- s8 max_signal;
s8 max_qual;
s8 max_noise;
Index: wireless-dev/net/mac80211/ieee80211.c
===================================================================
--- wireless-dev.orig/net/mac80211/ieee80211.c
+++ wireless-dev/net/mac80211/ieee80211.c
@@ -4211,7 +4211,7 @@ void ieee80211_rx_irqsafe(struct ieee802
{
struct ieee80211_local *local = hw_to_local(hw);
-// BUILD_BUG_ON(sizeof(struct ieee80211_rx_status) > sizeof(skb->cb));
+ BUILD_BUG_ON(sizeof(struct ieee80211_rx_status) > sizeof(skb->cb));
skb->dev = local->mdev;
/* copy status into skb->cb for use by tasklet */
Index: wireless-dev/net/mac80211/ieee80211_i.h
===================================================================
--- wireless-dev.orig/net/mac80211/ieee80211_i.h
+++ wireless-dev/net/mac80211/ieee80211_i.h
@@ -82,7 +82,6 @@ struct ieee80211_sta_bss {
int hw_mode;
int channel;
int freq;
- int rssi, signal;
int level, qual, noise;
u8 *wpa_ie;
size_t wpa_ie_len;
Index: wireless-dev/net/mac80211/sta_info.h
===================================================================
--- wireless-dev.orig/net/mac80211/sta_info.h
+++ wireless-dev/net/mac80211/sta_info.h
@@ -83,10 +83,8 @@ struct sta_info {
unsigned long rx_fragments; /* number of received MPDUs */
unsigned long rx_dropped; /* number of dropped MPDUs from this STA */
- int last_rssi; /* RSSI of last received frame from this STA */
- int last_signal; /* signal of last received frame from this STA */
int last_level; /* level of last received frame from this STA */
- int last_qual; /* qual of last received frame from this STA */
+ int last_qual; /* quality value of last received frame from this STA */
int last_noise; /* noise of last received frame from this STA */
int last_ack_rssi[3]; /* RSSI of last received ACKs from this STA */
unsigned long last_ack;
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
