diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 19:12:41 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 19:12:41 (GMT) |
commit | cb180840a0c6bff7c0787373c23cefdf20417a27 (patch) | |
tree | b291b4df78fe08c35297271163b71fd86350a53c /drivers/net/wireless/iwlwifi/mvm/sta.h | |
parent | 5631becbb8703d73239e097d222b183aa4f24e40 (diff) | |
parent | 8eb3871076875f247483f4a1fe6713e6d440c53e (diff) | |
download | linux-fsl-qoriq-cb180840a0c6bff7c0787373c23cefdf20417a27.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/iwlwifi/mvm/sta.h index 3efa0a0..94b265e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/iwlwifi/mvm/sta.h @@ -250,7 +250,6 @@ enum iwl_mvm_agg_state { * the first packet to be sent in legacy HW queue in Tx AGG stop flow. * Basically when next_reclaimed reaches ssn, we can tell mac80211 that * we are ready to finish the Tx AGG stop / start flow. - * @wait_for_ba: Expect block-ack before next Tx reply */ struct iwl_mvm_tid_data { u16 seq_number; @@ -260,7 +259,6 @@ struct iwl_mvm_tid_data { enum iwl_mvm_agg_state state; u16 txq_id; u16 ssn; - bool wait_for_ba; }; /** |