| Index: chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/beacon.c
|
| diff --git a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/beacon.c b/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/beacon.c
|
| index 4d4b22d52dfd230a7a61b3f0dd8b5b612c38af1f..6e3c17272dfc8363ee90329451cdd302400a9313 100644
|
| --- a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/beacon.c
|
| +++ b/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/beacon.c
|
| @@ -28,7 +28,7 @@ int ath_beaconq_config(struct ath_softc *sc)
|
| struct ath_hw *ah = sc->sc_ah;
|
| struct ath_common *common = ath9k_hw_common(ah);
|
| struct ath9k_tx_queue_info qi, qi_be;
|
| - int qnum;
|
| + struct ath_txq *txq;
|
|
|
| ath9k_hw_get_txq_props(ah, sc->beacon.beaconq, &qi);
|
| if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
|
| @@ -38,8 +38,8 @@ int ath_beaconq_config(struct ath_softc *sc)
|
| qi.tqi_cwmax = 0;
|
| } else {
|
| /* Adhoc mode; important thing is to use 2x cwmin. */
|
| - qnum = sc->tx.hwq_map[WME_AC_BE];
|
| - ath9k_hw_get_txq_props(ah, qnum, &qi_be);
|
| + txq = sc->tx.txq_map[WME_AC_BE];
|
| + ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
|
| qi.tqi_aifs = qi_be.tqi_aifs;
|
| qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
|
| qi.tqi_cwmax = qi_be.tqi_cwmax;
|
| @@ -366,7 +366,7 @@ void ath_beacon_tasklet(unsigned long data)
|
| ath_print(common, ATH_DBG_BEACON,
|
| "beacon is officially stuck\n");
|
| sc->sc_flags |= SC_OP_TSF_RESET;
|
| - ath_reset(sc, false);
|
| + ath_reset(sc, true);
|
| }
|
|
|
| return;
|
|
|