diff options
| author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-14 03:56:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:04 -0400 |
| commit | 927e70e9244e6ecdc7c28bc5424b0b8c11dee314 (patch) | |
| tree | ac2b65f0a465d39dc1f4811bf7cc53b9281219d5 /drivers/net/wireless/ath9k/xmit.c | |
| parent | b14ecdd0afa4f616fcd1fcff4b902e15334256c7 (diff) | |
ath9k: Remove remaining occurences of ath_skb_map functions
Use direct pci functions instead.
Also, use sc_ht_info.tx_chan_width directly and remove ath_cwm_macmode.
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 55f3c8e5bbbc..8d31ad7952be 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
| @@ -1427,7 +1427,6 @@ static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx) | |||
| 1427 | struct ath_hal *ah = sc->sc_ah; | 1427 | struct ath_hal *ah = sc->sc_ah; |
| 1428 | int i; | 1428 | int i; |
| 1429 | int npend = 0; | 1429 | int npend = 0; |
| 1430 | enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc); | ||
| 1431 | 1430 | ||
| 1432 | /* XXX return value */ | 1431 | /* XXX return value */ |
| 1433 | if (!(sc->sc_flags & SC_OP_INVALID)) { | 1432 | if (!(sc->sc_flags & SC_OP_INVALID)) { |
| @@ -1452,9 +1451,10 @@ static void ath_drain_txdataq(struct ath_softc *sc, bool retry_tx) | |||
| 1452 | 1451 | ||
| 1453 | spin_lock_bh(&sc->sc_resetlock); | 1452 | spin_lock_bh(&sc->sc_resetlock); |
| 1454 | if (!ath9k_hw_reset(ah, | 1453 | if (!ath9k_hw_reset(ah, |
| 1455 | sc->sc_ah->ah_curchan, ht_macmode, | 1454 | sc->sc_ah->ah_curchan, |
| 1456 | sc->sc_tx_chainmask, sc->sc_rx_chainmask, | 1455 | sc->sc_ht_info.tx_chan_width, |
| 1457 | sc->sc_ht_extprotspacing, true, &status)) { | 1456 | sc->sc_tx_chainmask, sc->sc_rx_chainmask, |
| 1457 | sc->sc_ht_extprotspacing, true, &status)) { | ||
| 1458 | 1458 | ||
| 1459 | DPRINTF(sc, ATH_DBG_FATAL, | 1459 | DPRINTF(sc, ATH_DBG_FATAL, |
| 1460 | "%s: unable to reset hardware; hal status %u\n", | 1460 | "%s: unable to reset hardware; hal status %u\n", |