[PATCH] Fix iwl typo

[PATCH] Fix iwl typo

[Jens Axboe]

Hi,

I came across this one:

drivers/net/wireless/iwlwifi/iwl-tx.c: In function ?iwl_tx_agg_stop?:
drivers/net/wireless/iwlwifi/iwl-tx.c:1356: warning: passing argument 1
of ?ieee80211_stop_tx_ba_cb_irqsafe? from incompatible pointer type
include/net/mac80211.h:2128: note: expected ?struct ieee80211_vif *? but
argument is of type ?struct ieee80211_hw *?

which just looks like a simple typo, priv->hw should be priv->vif.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 58b132f..00da5e1 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;
 	}

-- 
Jens Axboe

Re: [PATCH] Fix iwl typo

[John W. Linville]

On Fri, Dec 11, 2009 at 12:40:54PM +0100, Jens Axboe wrote:
> Hi,
> 
> I came across this one:
> 
> drivers/net/wireless/iwlwifi/iwl-tx.c: In function ?iwl_tx_agg_stop?:
> drivers/net/wireless/iwlwifi/iwl-tx.c:1356: warning: passing argument 1
> of ?ieee80211_stop_tx_ba_cb_irqsafe? from incompatible pointer type
> include/net/mac80211.h:2128: note: expected ?struct ieee80211_vif *? but
> argument is of type ?struct ieee80211_hw *?
> 
> which just looks like a simple typo, priv->hw should be priv->vif.
> 
> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

A patch like this is already in net-2.6.

Thanks,

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.