diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 43882f9e25c4..626418222c85 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c | |||
@@ -67,7 +67,7 @@ int ath_beaconq_config(struct ath_softc *sc) | |||
67 | * up rate codes, and channel flags. Beacons are always sent out at the | 67 | * up rate codes, and channel flags. Beacons are always sent out at the |
68 | * lowest rate, and are not retried. | 68 | * lowest rate, and are not retried. |
69 | */ | 69 | */ |
70 | static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, | 70 | static void ath_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif, |
71 | struct ath_buf *bf, int rateidx) | 71 | struct ath_buf *bf, int rateidx) |
72 | { | 72 | { |
73 | struct sk_buff *skb = bf->bf_mpdu; | 73 | struct sk_buff *skb = bf->bf_mpdu; |
@@ -82,7 +82,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, | |||
82 | 82 | ||
83 | sband = &sc->sbands[common->hw->conf.channel->band]; | 83 | sband = &sc->sbands[common->hw->conf.channel->band]; |
84 | rate = sband->bitrates[rateidx].hw_value; | 84 | rate = sband->bitrates[rateidx].hw_value; |
85 | if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) | 85 | if (vif->bss_conf.use_short_preamble) |
86 | rate |= sband->bitrates[rateidx].hw_value_short; | 86 | rate |= sband->bitrates[rateidx].hw_value_short; |
87 | 87 | ||
88 | memset(&info, 0, sizeof(info)); | 88 | memset(&info, 0, sizeof(info)); |
@@ -209,7 +209,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, | |||
209 | } | 209 | } |
210 | } | 210 | } |
211 | 211 | ||
212 | ath_beacon_setup(sc, avp, bf, info->control.rates[0].idx); | 212 | ath_beacon_setup(sc, vif, bf, info->control.rates[0].idx); |
213 | 213 | ||
214 | while (skb) { | 214 | while (skb) { |
215 | ath_tx_cabq(hw, skb); | 215 | ath_tx_cabq(hw, skb); |