diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
| commit | 78f42aee884dedfd157f79d01f069550edbc95cf (patch) | |
| tree | 1f0b6a91c06cae83a647a076377d3279f7a9fb78 /drivers/net/wireless/iwlegacy/commands.h | |
| parent | aa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c (diff) | |
| parent | 8708aac79e4572ba673d7a21e94ddca9f3abb7fc (diff) | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/net/wireless/iwlegacy/commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/commands.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/commands.h b/drivers/net/wireless/iwlegacy/commands.h index 25dd7d28d022c..3b6c994008920 100644 --- a/drivers/net/wireless/iwlegacy/commands.h +++ b/drivers/net/wireless/iwlegacy/commands.h @@ -1134,8 +1134,9 @@ struct il_wep_cmd { #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) -#define RX_RES_PHY_FLAGS_ANTENNA_MSK 0xf0 +#define RX_RES_PHY_FLAGS_ANTENNA_MSK 0x70 #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 +#define RX_RES_PHY_FLAGS_AGG_MSK cpu_to_le16(1 << 7) #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8) #define RX_RES_STATUS_SEC_TYPE_NONE (0x0 << 8) |