diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-19 14:56:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-19 14:56:34 -0500 |
commit | 0b7164458fc184455239ea3676af1b362df1ce1d (patch) | |
tree | 6b968c6ec46e7a949e930de85f75afc337128b97 /drivers/net/wireless/iwlwifi/dvm/commands.h | |
parent | 303c07db487be59ae9fda10600ea65ca11c21497 (diff) | |
parent | b53cf458ea20dd7f5e32611366f63728e40c9021 (diff) | |
download | blackbird-op-linux-0b7164458fc184455239ea3676af1b362df1ce1d.tar.gz blackbird-op-linux-0b7164458fc184455239ea3676af1b362df1ce1d.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/commands.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/commands.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h index 02c9ebb3b340..84e2c0fcfef6 100644 --- a/drivers/net/wireless/iwlwifi/dvm/commands.h +++ b/drivers/net/wireless/iwlwifi/dvm/commands.h @@ -1403,6 +1403,7 @@ enum { #define AGG_TX_STATUS_MSK 0x00000fff /* bits 0:11 */ #define AGG_TX_TRY_MSK 0x0000f000 /* bits 12:15 */ +#define AGG_TX_TRY_POS 12 #define AGG_TX_STATE_LAST_SENT_MSK (AGG_TX_STATE_LAST_SENT_TTL_MSK | \ AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK | \ |