1 files changed, 49 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index 93dfea897ff2..76acd2b75fcd 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1304,6 +1304,38 @@ static void ath_rc_tx_status(struct ath_softc *sc,
                          xretries, long_retry);
 }
 
+static struct ath_rate_table *ath_choose_rate_table(struct ath_softc *sc,
+                                                    enum ieee80211_band band,
+                                                    bool is_ht, bool is_cw_40)
+{
+        int mode = 0;
+
+        switch(band) {
+        case IEEE80211_BAND_2GHZ:
+                mode = ATH9K_MODE_11G;
+                if (is_ht)
+                        mode = ATH9K_MODE_11NG_HT20;
+                if (is_cw_40)
+                        mode = ATH9K_MODE_11NG_HT40PLUS;
+                break;
+        case IEEE80211_BAND_5GHZ:
+                mode = ATH9K_MODE_11A;
+                if (is_ht)
+                        mode = ATH9K_MODE_11NA_HT20;
+                if (is_cw_40)
+                        mode = ATH9K_MODE_11NA_HT40PLUS;
+                break;
+        default:
+                DPRINTF(sc, ATH_DBG_CONFIG, "Invalid band\n");
+                return NULL;
+        }
+
+        BUG_ON(mode >= ATH9K_MODE_MAX);
+
+        DPRINTF(sc, ATH_DBG_CONFIG, "Choosing rate table for mode: %d\n", mode);
+        return sc->hw_rate_table[mode];
+}
+
 static void ath_rc_init(struct ath_softc *sc,
                         struct ath_rate_priv *ath_rc_priv,
                         struct ieee80211_supported_band *sband,
@@ -1314,16 +1346,25 @@ static void ath_rc_init(struct ath_softc *sc,
         u8 *ht_mcs = (u8 *)&ath_rc_priv->neg_ht_rates;
         u8 i, j, k, hi = 0, hthi = 0;
 
-        rate_table = sc->hw_rate_table[sc->sc_curmode];
+        /* FIXME: Adhoc */
+        if ((sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) ||
+            (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC)) {
+                bool is_cw_40 = sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                rate_table = ath_choose_rate_table(sc, sband->band,
+                                                   sta->ht_cap.ht_supported,
+                                                   is_cw_40);
+        } else if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP) {
+                /* sc_curmode would be set on init through config() */
+                rate_table = sc->hw_rate_table[sc->sc_curmode];
+        }
 
-        if (sta->ht_cap.ht_supported) {
-                if (sband->band == IEEE80211_BAND_2GHZ)
-                        rate_table = sc->hw_rate_table[ATH9K_MODE_11NG_HT20];
-                else
-                        rate_table = sc->hw_rate_table[ATH9K_MODE_11NA_HT20];
+        if (!rate_table) {
+                DPRINTF(sc, ATH_DBG_FATAL, "Rate table not initialized\n");
+                return;
+        }
 
+        if (sta->ht_cap.ht_supported) {
                 ath_rc_priv->ht_cap = (WLAN_RC_HT_FLAG | WLAN_RC_DS_FLAG);
-
                 if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
                         ath_rc_priv->ht_cap |= WLAN_RC_40_FLAG;
         }
@@ -1531,8 +1572,7 @@ static void *ath_rate_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp
         rate_priv = kzalloc(sizeof(struct ath_rate_priv), gfp);
         if (!rate_priv) {
                 DPRINTF(sc, ATH_DBG_FATAL,
-                        "%s: Unable to allocate private rc structure\n",
-                        __func__);
+                        "Unable to allocate private rc structure\n");
                 return NULL;
         }