[PATCH 1/4] Mac80211: Add new names for statistics variables

[PATCH 1/4] Mac80211: Add new names for statistics variables

[Larry Finger]

Patch 1/4: Add new names for stats variables to the various structs in mac80211.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

Index: wireless-dev/include/net/mac80211.h
===================================================================
--- wireless-dev.orig/include/net/mac80211.h
+++ wireless-dev/include/net/mac80211.h
@@ -229,6 +229,8 @@ struct ieee80211_rx_status {
 	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;
 	int antenna;
 	int rate;
@@ -543,7 +545,9 @@ struct ieee80211_hw {
 	/* 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;
 
 	/* Number of available hardware TX queues for data packets.
Index: wireless-dev/net/mac80211/sta_info.h
===================================================================
--- wireless-dev.orig/net/mac80211/sta_info.h
+++ wireless-dev/net/mac80211/sta_info.h
@@ -85,6 +85,8 @@ struct sta_info {
 
 	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_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;
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,8 @@ struct ieee80211_sta_bss {
 	int hw_mode;
 	int channel;
 	int freq;
-	int rssi, signal, noise;
+	int rssi, signal;
+	int level, qual, noise;
 	u8 *wpa_ie;
 	size_t wpa_ie_len;
 	u8 *rsn_ie;

Re: [PATCH 1/4] Mac80211: Add new names for statistics variables

[Michael Buesch]

On Saturday 14 April 2007 20:13, Larry Finger wrote:
> 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));

Whoops?

-- 
Greetings Michael.

Re: [PATCH 1/4] Mac80211: Add new names for statistics variables

[Larry Finger]

Michael Buesch wrote:
> On Saturday 14 April 2007 20:13, Larry Finger wrote:
>> 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));
> 
> Whoops?

Yes, the BUILD_BUG_ON killed the compilation with both old and new names in the structs. Patch 4/4 
restores the statement.

Larry

Re: [PATCH 1/4] Mac80211: Add new names for statistics variables

[Michael Wu]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

On Saturday 14 April 2007 14:24, Larry Finger wrote:
> Yes, the BUILD_BUG_ON killed the compilation with both old and new names in
> the structs. Patch 4/4 restores the statement.
>
I don't think this split is necessary for renaming. Just do it all at once. It 
helps git bisect. My suggestion for the patch split was to fix 
bcm43xx-mac80211's statistics reporting convention in one patch and then 
rename everything in another patch, as they are two different issues.

-Michael Wu

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]