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>

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 7d9a263..7566044 100644 (file)
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -2132,9 +2132,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                        (curchan->band == IEEE80211_BAND_2GHZ) ?
                        CHANNEL_G : CHANNEL_A;
 
-               if (conf->ht.enabled) {
-                       if (conf->ht.channel_type == NL80211_CHAN_HT40PLUS ||
-                           conf->ht.channel_type == NL80211_CHAN_HT40MINUS)
+               if (conf_is_ht(conf)) {
+                       if (conf_is_ht40(conf))
                                sc->tx_chan_width = ATH9K_HT_MACMODE_2040;
 
                        sc->sc_ah->ah_channels[pos].chanmode =
@@ -2142,7 +2141,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                                                    conf->ht.channel_type);
                }
 
-               ath_update_chainmask(sc, conf->ht.enabled);
+               ath_update_chainmask(sc, conf_is_ht(conf));
 
                if (ath_set_channel(sc, &sc->sc_ah->ah_channels[pos]) < 0) {
                        DPRINTF(sc, ATH_DBG_FATAL, "Unable to set channel\n");

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index 1b71b93..0686a7c 100644 (file)
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -875,7 +875,7 @@ static void ath_rc_ratefind(struct ath_softc *sc,
         * above conditions.
         */
        if ((sc->hw->conf.channel->band == IEEE80211_BAND_2GHZ) &&
-           (sc->hw->conf.ht.enabled)) {
+           (conf_is_ht(&sc->hw->conf))) {
                u8 dot11rate = rate_table->info[rix].dot11rate;
                u8 phy = rate_table->info[rix].phy;
                if (i == 4 &&
@@ -1511,7 +1511,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
                        tx_info, &is_probe, false);
 
        /* Check if aggregation has to be enabled for this tid */
-       if (hw->conf.ht.enabled) {
+       if (conf_is_ht(&hw->conf)) {
                if (ieee80211_is_data_qos(fc)) {
                        u8 *qc, tid;
                        struct ath_node *an;

diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index e28889b..9e910f7 100644 (file)
--- 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,
        (sc->sc_flags & SC_OP_PREAMBLE_SHORT) ?
                (bf->bf_state.bf_type |= BUF_SHORT_PREAMBLE) :
                (bf->bf_state.bf_type &= ~BUF_SHORT_PREAMBLE);
-       (sc->hw->conf.ht.enabled && !is_pae(skb) &&
+       (conf_is_ht(&sc->hw->conf) && !is_pae(skb) &&
         (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) ?
                (bf->bf_state.bf_type |= BUF_HT) :
                (bf->bf_state.bf_type &= ~BUF_HT);