Merge branch 'upstream-fixes' into upstream
Jeff Garzik [Tue, 12 Sep 2006 15:42:45 +0000 (11:42 -0400)]
1  2 
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/net/wireless/zd1211rw/zd_mac.c
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;