Skip to contentSkip to conversation

Fix iwl typo

PATCH In review Jens Axboe 2 participants 2 messages Dec 11, 2009 Networking drivers (wireless)

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

PATCH 1/1 Fix iwl typo

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.

drivers/net/wireless/iwlwifi/iwl-tx.c +1 -1
index 58b132f..00da5e1 100644
@@ -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;
 	}
Signature · 1 line
Jens Axboe
#1 lore raw
Quoted 10 lines · 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 *?

Quoted 3 lines

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

A patch like this is already in net-2.6.

Thanks,

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.