Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[deliverable/linux.git] / drivers / net / wireless / ath / ath9k / htc_drv_txrx.c

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index bd8251c1c7494fe69a140d4089d6d2d586c0eaae..2774dd13c786090b8102cf809aa5448980c21996 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -490,7 +490,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv,
                if (txs->ts_flags & ATH9K_HTC_TXSTAT_SGI)
                        rate->flags |= IEEE80211_TX_RC_SHORT_GI;
        } else {
-               if (cur_conf->channel->band == IEEE80211_BAND_5GHZ)
+               if (cur_conf->chandef.chan->band == IEEE80211_BAND_5GHZ)
                        rate->idx += 4; /* No CCK rates */
        }
 
@@ -939,7 +939,7 @@ static void ath9k_process_rate(struct ieee80211_hw *hw,
                return;
        }
 
-       band = hw->conf.channel->band;
+       band = hw->conf.chandef.chan->band;
        sband = hw->wiphy->bands[band];
 
        for (i = 0; i < sband->n_bitrates; i++) {
@@ -1082,8 +1082,8 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
        }
 
        rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
-       rx_status->band = hw->conf.channel->band;
-       rx_status->freq = hw->conf.channel->center_freq;
+       rx_status->band = hw->conf.chandef.chan->band;
+       rx_status->freq = hw->conf.chandef.chan->center_freq;
        rx_status->signal =  rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
        rx_status->antenna = rxbuf->rxstatus.rs_antenna;
        rx_status->flag |= RX_FLAG_MACTIME_END;