From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Sep 2006 20:40:03 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~38^2~11
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=34fa0e319c760189f1fc226acc5b3b387dc58099;p=powerpc.git

Merge branch 'upstream-fixes' into upstream
---

34fa0e319c760189f1fc226acc5b3b387dc58099
diff --cc drivers/net/wireless/zd1211rw/zd_mac.h
index 082bcf8ec8,b3ba49b846..2b596cc8a4
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@@ -120,14 -120,17 +120,17 @@@ enum mac_flags 
  	MAC_FIXED_CHANNEL = 0x01,
  };
  
+ #define ZD_MAC_STATS_BUFFER_SIZE 16
+ 
  struct zd_mac {
 -	struct net_device *netdev;
  	struct zd_chip chip;
  	spinlock_t lock;
 +	struct net_device *netdev;
  	/* Unlocked reading possible */
  	struct iw_statistics iw_stats;
- 	u8 qual_average;
- 	u8 rssi_average;
+ 	unsigned int stats_count;
+ 	u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE];
+ 	u8 rssi_buffer[ZD_MAC_STATS_BUFFER_SIZE];
  	u8 regdomain;
  	u8 default_regdomain;
  	u8 requested_channel;