On Sun, Nov 8, 2009 at 8:00 AM, Jouni Malinen <j@xxxxx> wrote: > 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? Indeed, my rebase seems to have not gone through well but I do recall having changed the sc->hw to hw here, will go review to see which patches need fixing. Thanks for the review. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
