]> git.baikalelectronics.ru Git - kernel.git/commit
iwlagn: pending frames musn't be incremented if agg is on
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 20 Sep 2011 22:37:26 +0000 (15:37 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Sep 2011 20:19:43 +0000 (16:19 -0400)
commit2d9a1e6d6794019bc8f10e0b656296a9b9d4668b
tree85a81389ac8eebdfe6aaf34e4278a20fd803ff7b
parente3cd43cb9cdbcb8ce02828b61be75492539661e4
iwlagn: pending frames musn't be incremented if agg is on

During my works on the transport layer I removed code that updated
a local variable (is_agg) that is needed to keep the pending_frames
count up to date. Fix this.

Also, there should be no way to have a packet with TX_CTL_AMPDU set
while the internal aggregation state machine is not in AGG_ON state.
Add a WARN_ON to ensure that.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c