diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-12-23 18:58:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:59:31 -0500 |
commit | ecf70441a3d53dd96cb1b454060fe39f9c3db301 (patch) | |
tree | aaabbb86eeee05ba394f9d1f721d806c96e8dc61 /drivers/net/wireless/ath9k/xmit.c | |
parent | c9e27d94f5fc726f88897914025619fbfc18b23c (diff) |
ath9k: make use of conf_is_ht*() in the rest of the driver
Use shiny new conf_is_ht*() helpers, we can later remove ht.enabled if
desired.
Signed-off-by: Luis R. Rodriguez <lrodriguez@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index e28889bc0ac5..9e910f7a2f36 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
@@ -1690,7 +1690,7 @@ static int ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf, | |||
1690 | (sc->sc_flags & SC_OP_PREAMBLE_SHORT) ? | 1690 | (sc->sc_flags & SC_OP_PREAMBLE_SHORT) ? |
1691 | (bf->bf_state.bf_type |= BUF_SHORT_PREAMBLE) : | 1691 | (bf->bf_state.bf_type |= BUF_SHORT_PREAMBLE) : |
1692 | (bf->bf_state.bf_type &= ~BUF_SHORT_PREAMBLE); | 1692 | (bf->bf_state.bf_type &= ~BUF_SHORT_PREAMBLE); |
1693 | (sc->hw->conf.ht.enabled && !is_pae(skb) && | 1693 | (conf_is_ht(&sc->hw->conf) && !is_pae(skb) && |
1694 | (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) ? | 1694 | (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) ? |
1695 | (bf->bf_state.bf_type |= BUF_HT) : | 1695 | (bf->bf_state.bf_type |= BUF_HT) : |
1696 | (bf->bf_state.bf_type &= ~BUF_HT); | 1696 | (bf->bf_state.bf_type &= ~BUF_HT); |