diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-08-22 14:15:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-22 14:15:47 -0400 |
| commit | 6de3f7e911d27d6737c79b3f6b5069044ea408ec (patch) | |
| tree | 186dcf1897be76a4155f5a22a7f242c29f328c5a /drivers/net/wireless/iwlwifi/dvm/tx.c | |
| parent | 33dd7699cefd175c3a5d3d6077db9c8d8322c9a7 (diff) | |
| parent | 40503f7b48260a91ab65a4f8b00a2c6f004fa807 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index d17799b316d..f5ca73a8987 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c @@ -433,7 +433,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, * only. Check this here. */ if (WARN_ONCE(tid_data->agg.state != IWL_AGG_ON && - tid_data->agg.state != IWL_AGG_OFF, + tid_data->agg.state != IWL_AGG_OFF, "Tx while agg.state = %d", tid_data->agg.state)) goto drop_unlock_sta; |