diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 16:52:04 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 16:52:11 +0100 |
| commit | 94d2f0ba052150a6d7217aeb836f5a709d1cadda (patch) | |
| tree | 821df4458c8168253f9435894441e2d666f9f3e1 /drivers/net/wireless/iwlegacy/commands.h | |
| parent | 5360cfb2bcbdd7a906cf290036bd406985973e88 (diff) | |
| parent | 8457703f1e86aaf0f134402dd1e09e1f13e65222 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlegacy/commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/commands.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/commands.h b/drivers/net/wireless/iwlegacy/commands.h index 829d3b9aaa1..3b6c9940089 100644 --- a/drivers/net/wireless/iwlegacy/commands.h +++ b/drivers/net/wireless/iwlegacy/commands.h @@ -1136,6 +1136,7 @@ struct il_wep_cmd { #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) #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) |