diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 8b327bcad695..a13387882636 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -270,6 +270,7 @@ static void ath_paprd_activate(struct ath_softc *sc) | |||
270 | { | 270 | { |
271 | struct ath_hw *ah = sc->sc_ah; | 271 | struct ath_hw *ah = sc->sc_ah; |
272 | struct ath9k_hw_cal_data *caldata = ah->caldata; | 272 | struct ath9k_hw_cal_data *caldata = ah->caldata; |
273 | struct ath_common *common = ath9k_hw_common(ah); | ||
273 | int chain; | 274 | int chain; |
274 | 275 | ||
275 | if (!caldata || !caldata->paprd_done) | 276 | if (!caldata || !caldata->paprd_done) |
@@ -278,7 +279,7 @@ static void ath_paprd_activate(struct ath_softc *sc) | |||
278 | ath9k_ps_wakeup(sc); | 279 | ath9k_ps_wakeup(sc); |
279 | ar9003_paprd_enable(ah, false); | 280 | ar9003_paprd_enable(ah, false); |
280 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { | 281 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { |
281 | if (!(ah->caps.tx_chainmask & BIT(chain))) | 282 | if (!(common->tx_chainmask & BIT(chain))) |
282 | continue; | 283 | continue; |
283 | 284 | ||
284 | ar9003_paprd_populate_single_table(ah, caldata, chain); | 285 | ar9003_paprd_populate_single_table(ah, caldata, chain); |
@@ -300,6 +301,7 @@ void ath_paprd_calibrate(struct work_struct *work) | |||
300 | struct ieee80211_supported_band *sband = &sc->sbands[band]; | 301 | struct ieee80211_supported_band *sband = &sc->sbands[band]; |
301 | struct ath_tx_control txctl; | 302 | struct ath_tx_control txctl; |
302 | struct ath9k_hw_cal_data *caldata = ah->caldata; | 303 | struct ath9k_hw_cal_data *caldata = ah->caldata; |
304 | struct ath_common *common = ath9k_hw_common(ah); | ||
303 | int qnum, ftype; | 305 | int qnum, ftype; |
304 | int chain_ok = 0; | 306 | int chain_ok = 0; |
305 | int chain; | 307 | int chain; |
@@ -333,7 +335,7 @@ void ath_paprd_calibrate(struct work_struct *work) | |||
333 | ath9k_ps_wakeup(sc); | 335 | ath9k_ps_wakeup(sc); |
334 | ar9003_paprd_init_table(ah); | 336 | ar9003_paprd_init_table(ah); |
335 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { | 337 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { |
336 | if (!(ah->caps.tx_chainmask & BIT(chain))) | 338 | if (!(common->tx_chainmask & BIT(chain))) |
337 | continue; | 339 | continue; |
338 | 340 | ||
339 | chain_ok = 0; | 341 | chain_ok = 0; |