iwlagn: pending frames musn't be incremented if agg is on

Browse source

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>

...

This commit is contained in:

Emmanuel Grumbach 2011-09-20 15:37:26 -07:00 • committed by John W. Linville

parent edb5c2f38d

commit 08ecf10441

2 changed files with 5 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

View file

4

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

View file