diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-10-10 07:27:05 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:11 -0400 |
| commit | 281e27c8092da95c83f6bc3df8fc11235f4b364c (patch) | |
| tree | 4c676ba8c348306acb164010483ce92a26a0a4c5 /drivers/net | |
| parent | 9e8107ed9058e910eee982ee94d3a5eb201fb5d1 (diff) | |
| download | blackbird-op-linux-281e27c8092da95c83f6bc3df8fc11235f4b364c.tar.gz blackbird-op-linux-281e27c8092da95c83f6bc3df8fc11235f4b364c.zip | |
iwlagn: do nothing when disable agg in wrong state
When disable aggregation request come in on wrong agg state. ignore it
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index fa2ce398da85..fec7065e75e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -636,6 +636,8 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, default: IWL_WARN(trans, "Stopping AGG while state not ON" "or starting\n"); + spin_unlock_irqrestore(&trans->shrd->sta_lock, flags); + return 0; } write_ptr = trans_pcie->txq[txq_id].q.write_ptr; |
