wlcore: set wl->ht_cap per-band

Save the ht_cap IE per-band, so we can configure different
params to BG and A bands (we currently don't support MIMO
on A band)

[Small fix for rx_highest - Arik]

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index e400d1987e6cfa611e53a15894279ef094ceed5a..774a1b71e84e8e01e92f8d1ea0307f61c316da88 100644 (file)
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -1423,7 +1423,10 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
        wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
        wl->fw_status_priv_len = 0;
        wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
-       memcpy(&wl->ht_cap, &wl12xx_ht_cap, sizeof(wl12xx_ht_cap));
+       memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ], &wl12xx_ht_cap,
+              sizeof(wl12xx_ht_cap));
+       memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ], &wl12xx_ht_cap,
+              sizeof(wl12xx_ht_cap));
        wl12xx_conf_init(wl);
 
        if (!fref_param) {

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 5a6c4cc9577e11b774dcfc5bf6cde4cc6ff7a8fb..6cd61186d06c87dbc62a1c59aa96b9ad8773b8f9 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -596,7 +596,7 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
                        WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
 
                /* PG 1.0 has some problems with MCS_13, so disable it */
-               wl->ht_cap.mcs.rx_mask[1] &= ~BIT(5);
+               wl->ht_cap[IEEE80211_BAND_2GHZ].mcs.rx_mask[1] &= ~BIT(5);
 
                /* TODO: need to blocksize alignment for RX/TX separately? */
                break;
@@ -1086,7 +1086,7 @@ static struct ieee80211_sta_ht_cap wl18xx_siso20_ht_cap = {
 };
 
 /* HT cap appropriate for MIMO rates in 20mhz channel */
-static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap = {
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
        .cap = IEEE80211_HT_CAP_SGI_20,
        .ht_supported = true,
        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
@@ -1098,6 +1098,18 @@ static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap = {
                },
 };
 
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_5ghz = {
+       .cap = IEEE80211_HT_CAP_SGI_20,
+       .ht_supported = true,
+       .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+       .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+       .mcs = {
+               .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+               .rx_highest = cpu_to_le16(72),
+               .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+               },
+};
+
 static int __devinit wl18xx_probe(struct platform_device *pdev)
 {
        struct wl1271 *wl;
@@ -1127,13 +1139,25 @@ static int __devinit wl18xx_probe(struct platform_device *pdev)
        wl->static_data_priv_len = sizeof(struct wl18xx_static_data_priv);
 
        if (!strcmp(ht_mode_param, "wide")) {
-               memcpy(&wl->ht_cap, &wl18xx_siso40_ht_cap,
+               memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                      &wl18xx_siso40_ht_cap,
+                      sizeof(wl18xx_siso40_ht_cap));
+               memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                      &wl18xx_siso40_ht_cap,
                       sizeof(wl18xx_siso40_ht_cap));
        } else if (!strcmp(ht_mode_param, "mimo")) {
-               memcpy(&wl->ht_cap, &wl18xx_mimo_ht_cap,
-                      sizeof(wl18xx_mimo_ht_cap));
+               memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                      &wl18xx_mimo_ht_cap_2ghz,
+                      sizeof(wl18xx_mimo_ht_cap_2ghz));
+               memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                      &wl18xx_mimo_ht_cap_5ghz,
+                      sizeof(wl18xx_mimo_ht_cap_5ghz));
        } else if (!strcmp(ht_mode_param, "siso20")) {
-               memcpy(&wl->ht_cap, &wl18xx_siso20_ht_cap,
+               memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                      &wl18xx_siso20_ht_cap,
+                      sizeof(wl18xx_siso20_ht_cap));
+               memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                      &wl18xx_siso20_ht_cap,
                       sizeof(wl18xx_siso20_ht_cap));
        } else {
                wl1271_error("invalid ht_mode '%s'", ht_mode_param);

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 1974be0ccd589a27e010251af7ab6a6379af7eb9..c08df334b9d5af57a080b3727815fe5fc78c0f34 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -5031,12 +5031,14 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
         */
        memcpy(&wl->bands[IEEE80211_BAND_2GHZ], &wl1271_band_2ghz,
               sizeof(wl1271_band_2ghz));
-       memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap, &wl->ht_cap,
-              sizeof(wl->ht_cap));
+       memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap,
+              &wl->ht_cap[IEEE80211_BAND_2GHZ],
+              sizeof(*wl->ht_cap));
        memcpy(&wl->bands[IEEE80211_BAND_5GHZ], &wl1271_band_5ghz,
               sizeof(wl1271_band_5ghz));
-       memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap, &wl->ht_cap,
-              sizeof(wl->ht_cap));
+       memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap,
+              &wl->ht_cap[IEEE80211_BAND_5GHZ],
+              sizeof(*wl->ht_cap));
 
        wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
                &wl->bands[IEEE80211_BAND_2GHZ];

diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 19678738a06968a5c327a780d452d306ca05b671..37a80f4bf5bb97221320a4ba3aef5c8dac9121be 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -368,7 +368,7 @@ struct wl1271 {
        u8 hw_min_ht_rate;
 
        /* HW HT (11n) capabilities */
-       struct ieee80211_sta_ht_cap ht_cap;
+       struct ieee80211_sta_ht_cap ht_cap[IEEE80211_NUM_BANDS];
 
        /* size of the private FW status data */
        size_t fw_status_priv_len;