diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 12:41:09 +1100 |
commit | 5cdb6688c5db7f92821db5ef2ca3c0c0ff52c23b (patch) | |
tree | ecbf35920ddeb05781f3b58f26dbfa5407a8a314 /drivers/net/wireless/ath/ath9k/mac.h | |
parent | 2e90d1edd450555b4daa96bca69f61be336baf1e (diff) | |
parent | 33175d84ee3fa29991adb80513683e010769e807 (diff) |
Merge remote-tracking branch 'net/master'
Conflicts:
drivers/net/Kconfig
lib/Makefile
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 7512f97e8f49..04d58ae923bb 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h @@ -639,6 +639,8 @@ enum ath9k_rx_filter { ATH9K_RX_FILTER_PHYERR = 0x00000100, ATH9K_RX_FILTER_MYBEACON = 0x00000200, ATH9K_RX_FILTER_COMP_BAR = 0x00000400, + ATH9K_RX_FILTER_COMP_BA = 0x00000800, + ATH9K_RX_FILTER_UNCOMP_BA_BAR = 0x00001000, ATH9K_RX_FILTER_PSPOLL = 0x00004000, ATH9K_RX_FILTER_PHYRADAR = 0x00002000, ATH9K_RX_FILTER_MCAST_BCAST_ALL = 0x00008000, |