Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 20f2a77e54d2..6cf0c9ef47aa 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -279,6 +279,7 @@ struct ar9170 {
                 unsigned int beacon_max_len;
                 bool rx_stream;
                 bool tx_stream;
+                bool rx_filter;
                 unsigned int mem_blocks;
                 unsigned int mem_block_size;
                 unsigned int rx_size;
@@ -314,6 +315,7 @@ struct ar9170 {
         u64 cur_mc_hash;
         u32 cur_filter;
         unsigned int filter_state;
+        unsigned int rx_filter_caps;
         bool sniffer_enabled;
 
         /* MAC */