[PATCH 06/29] ath9k: use correct hw for tx aggregation TX completion

Jouni Malinen j at w1.fi
Sun Nov 8 16:00:56 UTC 2009


On Sat, Nov 07, 2009 at 03:18:43PM -0500, Luis R. Rodriguez wrote:
> When ath9k virtual wiphys are used the sc->hw will not always represent
> the active hw, instead we need to get it from the skb->cb private
> driver area. This ensures the right hw is used to find a sta for
> the TX'd skb.

> diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
> @@ -267,7 +267,10 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
> +	struct ieee80211_hw *hw;
>  	struct ieee80211_hdr *hdr;
> +	struct ieee80211_tx_info *tx_info;
> +	struct ath_tx_info_priv *tx_info_priv;

> @@ -280,6 +283,10 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
> +	tx_info = IEEE80211_SKB_CB(skb);
> +	tx_info_priv = (struct ath_tx_info_priv *) tx_info->rate_driver_data[0];
> +	hw = tx_info_priv->aphy->hw;

Umm.. This adds a set of new local variables, but no users for those
are added here. Was this supposed to also change the following
ieee80211_find_sta_by_hw() call to use the local hw variable instead of
sc->hw?

-- 
Jouni Malinen                                            PGP id EFC895FA



More information about the devel mailing list