wl18xx: explicitly remove the 5Ghz MIMO HT cap

The 18xx chip does not support MIMO in 5Ghz. Use the siso20 HT cap as
fallback in 5Ghz when "mimo" is requested.

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

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 066e8e5cbb66adca73de30f26d1dc2ea457f7584..365063b6f7c3f758a0e95f625e68d11bcc26fd2b 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1255,18 +1255,6 @@ static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
                },
 };
 
-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;
@@ -1309,9 +1297,10 @@ static int __devinit wl18xx_probe(struct platform_device *pdev)
                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
                       &wl18xx_mimo_ht_cap_2ghz,
                       sizeof(wl18xx_mimo_ht_cap_2ghz));
+               /* we don't support MIMO in 5Ghz */
                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
-                      &wl18xx_mimo_ht_cap_5ghz,
-                      sizeof(wl18xx_mimo_ht_cap_5ghz));
+                      &wl18xx_siso20_ht_cap,
+                      sizeof(wl18xx_siso20_ht_cap));
        } else if (!strcmp(ht_mode_param, "siso20")) {
                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
                       &wl18xx_siso20_ht_cap,