]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ath9k: initialize retry chain flags in tx99 code
authorLorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Mon, 9 Dec 2013 22:37:49 +0000 (23:37 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Dec 2013 15:56:22 +0000 (10:56 -0500)
Initialize first chain flags in ath9k_build_tx99_skb() according to
configured channel mode and channel width

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/tx99.c

index 57d775783ec827032dbae919fb7a1cd234f92f70..b686a749845038781e91c292f6070bb565a1da66 100644 (file)
@@ -48,7 +48,9 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
                               0x02, 0x23, 0x23, 0xab, 0x63, 0x89, 0x51, 0xb3,
                               0xe7, 0x8b, 0x72, 0x90, 0x4c, 0xe8, 0xfb, 0xc0};
        u32 len = 1200;
+       struct ieee80211_tx_rate *rate;
        struct ieee80211_hw *hw = sc->hw;
+       struct ath_hw *ah = sc->sc_ah;
        struct ieee80211_hdr *hdr;
        struct ieee80211_tx_info *tx_info;
        struct sk_buff *skb;
@@ -73,10 +75,16 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)
 
        tx_info = IEEE80211_SKB_CB(skb);
        memset(tx_info, 0, sizeof(*tx_info));
+       rate = &tx_info->control.rates[0];
        tx_info->band = hw->conf.chandef.chan->band;
        tx_info->flags = IEEE80211_TX_CTL_NO_ACK;
        tx_info->control.vif = sc->tx99_vif;
-       tx_info->control.rates[0].count = 1;
+       rate->count = 1;
+       if (ah->curchan && IS_CHAN_HT(ah->curchan)) {
+               rate->flags |= IEEE80211_TX_RC_MCS;
+               if (IS_CHAN_HT40(ah->curchan))
+                       rate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
+       }
 
        memcpy(skb->data + sizeof(*hdr), PN9Data, sizeof(PN9Data));