diff options
| author |   Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-29 00:41:59 +0200 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /drivers/net/wireless/ath/ath9k/mac.h | |
| parent | KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate() (diff) | |
| parent | KVM: x86: Update symbolic exit codes (diff) | |
| download | linux-dev-bf550fc93d9855872a95e69e4002256110d89858.tar.xz linux-dev-bf550fc93d9855872a95e69e4002256110d89858.zip | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 5865f92998e1..b02dfce964b4 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h @@ -149,6 +149,7 @@ struct ath_rx_status { u32 evm2; u32 evm3; u32 evm4; + u32 flag; /* see enum mac80211_rx_flags */ }; struct ath_htc_rx_status { @@ -533,7 +534,8 @@ struct ar5416_desc { #define AR_2040 0x00000002 #define AR_Parallel40 0x00000004 #define AR_Parallel40_S 2 -#define AR_RxStatusRsvd30 0x000000f8 +#define AR_STBC 0x00000008 /* on ar9280 and later */ +#define AR_RxStatusRsvd30 0x000000f0 #define AR_RxAntenna 0xffffff00 #define AR_RxAntenna_S 8 |