1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index b1e535b8ec48..ee2dbce42b4d 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1838,7 +1838,7 @@ void ath_rc_node_update(struct ieee80211_hw *hw, struct ath_rate_node *rc_priv)
         struct ath_softc *sc = hw->priv;
         u32 capflag = 0;
 
-        if (hw->conf.ht_conf.ht_supported) {
+        if (hw->conf.ht_cap.ht_supported) {
                 capflag |= ATH_RC_HT_FLAG | ATH_RC_DS_FLAG;
                 if (sc->sc_ht_info.tx_chan_width == ATH9K_HT_MACMODE_2040)
                         capflag |= ATH_RC_CW40_FLAG;
@@ -1910,7 +1910,7 @@ static void ath_tx_aggr_resp(struct ath_softc *sc,
          */
         si = container_of(sta, struct sta_info, sta);
         buffersize = IEEE80211_MIN_AMPDU_BUF <<
-                sband->ht_info.ampdu_factor; /* FIXME */
+                sband->ht_cap.ampdu_factor; /* FIXME */
         state = si->ampdu_mlme.tid_state_tx[tidno];
 
         if (state & HT_ADDBA_RECEIVED_MSK) {
@@ -1979,7 +1979,7 @@ static void ath_get_rate(void *priv, struct ieee80211_supported_band *sband,
 
         /* Check if aggregation has to be enabled for this tid */
 
-        if (hw->conf.ht_conf.ht_supported) {
+        if (hw->conf.ht_cap.ht_supported) {
                 if (ieee80211_is_data_qos(fc)) {
                         qc = ieee80211_get_qos_ctl(hdr);
                         tid = qc[0] & 0xf;
@@ -2027,8 +2027,8 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
 
         ath_setup_rates(sc, sband, sta, ath_rc_priv);
         if (sc->hw->conf.flags & IEEE80211_CONF_SUPPORT_HT_MODE) {
-                for (i = 0; i < MCS_SET_SIZE; i++) {
-                        if (sc->hw->conf.ht_conf.supp_mcs_set[i/8] & (1<<(i%8)))
+                for (i = 0; i < 77; i++) {
+                        if (sc->hw->conf.ht_cap.mcs.rx_mask[i/8] & (1<<(i%8)))
                                 ath_rc_priv->neg_ht_rates.rs_rates[j++] = i;
                         if (j == ATH_RATE_MAX)
                                 break;