Merge branch 'upstream-fixes' into upstream

diff --cc drivers/net/wireless/zd1211rw/zd_chip.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_mac.h
index 082bcf8ec8dc6fd5d69ad4911892b75397a45c34,b3ba49b84634b50ac209d62d7be19d591cf4a1ba..2b596cc8a41a638d6f4c7e3f58f719c31c33aaaf
--- 1/drivers/net/wireless/zd1211rw/zd_mac.h
--- 2/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;