diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-12-08 13:44:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-08 13:44:44 -0800 |
| commit | e61444d9209821469ed0d5a9128dcf2e494533ea (patch) | |
| tree | 17b406ce83e925da011d2b463ddf278b821c365d /drivers/net/wireless/iwlwifi/iwl-tx.c | |
| parent | sctp: fix compile error due to sysctl mismerge (diff) | |
| parent | ath5k: add support for Dell Vostro A860 LED (diff) | |
| download | linux-dev-e61444d9209821469ed0d5a9128dcf2e494533ea.tar.xz linux-dev-e61444d9209821469ed0d5a9128dcf2e494533ea.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 58b132f9cf28..00da5e152d46 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -1353,7 +1353,7 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid) if (priv->stations[sta_id].tid[tid].agg.state == IWL_EMPTYING_HW_QUEUE_ADDBA) { IWL_DEBUG_HT(priv, "AGG stop before setup done\n"); - ieee80211_stop_tx_ba_cb_irqsafe(priv->hw, ra, tid); + ieee80211_stop_tx_ba_cb_irqsafe(priv->vif, ra, tid); priv->stations[sta_id].tid[tid].agg.state = IWL_AGG_OFF; return 0; } |