wlcore: use all AP basic rates as default

[deliverable/linux.git] / drivers / net / wireless / ti / wlcore / main.c

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index c9ccf2757e2a55a5b121406ce6021f603c2d028e..9589aa956bf7707a9bfb71b54c9ab2a51dafb502 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1846,6 +1846,9 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                wl12xx_allocate_rate_policy(wl, &wlvif->sta.basic_rate_idx);
                wl12xx_allocate_rate_policy(wl, &wlvif->sta.ap_rate_idx);
                wl12xx_allocate_rate_policy(wl, &wlvif->sta.p2p_rate_idx);
+               wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
+               wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
+               wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
        } else {
                /* init ap data */
                wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
@@ -1855,13 +1858,19 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
                        wl12xx_allocate_rate_policy(wl,
                                                &wlvif->ap.ucast_rate_idx[i]);
+               wlvif->basic_rate_set = CONF_TX_AP_ENABLED_RATES;
+               /*
+                * TODO: check if basic_rate shouldn't be
+                * wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                * instead (the same thing for STA above).
+               */
+               wlvif->basic_rate = CONF_TX_AP_ENABLED_RATES;
+               /* TODO: this seems to be used only for STA, check it */
+               wlvif->rate_set = CONF_TX_AP_ENABLED_RATES;
        }
 
        wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
        wlvif->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
-       wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
-       wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
-       wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
        wlvif->beacon_int = WL1271_DEFAULT_BEACON_INT;
 
        /*