diff options
| author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-11 12:34:52 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-30 00:23:58 +0400 |
| commit | b4696c8b9233bea812b972a5e79c5db7ecf13867 (patch) | |
| tree | af515054456aa403ca973ecf9640e15639f75f5a /drivers/net/wireless/ath9k/xmit.c | |
| parent | 6a2b9e8c8f4be9954933051719b312adcfb7263d (diff) | |
| download | linux-b4696c8b9233bea812b972a5e79c5db7ecf13867.tar.xz | |
ath9k: Use a single opmode variable
ah_opmode and sc_opmode are redundant.
This patch removes sc_opmode.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index a24a3a5b0e62..0b5b2dd92562 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c @@ -1047,7 +1047,7 @@ static void ath_tx_complete_aggr_rifs(struct ath_softc *sc, * when perform internal reset in this routine. * Only enable reset in STA mode for now. */ - if (sc->sc_opmode == ATH9K_M_STA) + if (sc->sc_ah->ah_opmode == ATH9K_M_STA) needreset = 1; } } else { @@ -1454,7 +1454,7 @@ static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx) "%s: Unable to stop TxDMA. Reset HAL!\n", __func__); spin_lock_bh(&sc->sc_resetlock); - if (!ath9k_hw_reset(ah, sc->sc_opmode, + if (!ath9k_hw_reset(ah, &sc->sc_curchan, ht_macmode, sc->sc_tx_chainmask, sc->sc_rx_chainmask, sc->sc_ht_extprotspacing, true, &status)) { |