wl12xx: remove deprecated CONFIG_WL12XX_HT flag

The driver now support HT properly, so we can always have HT enabled.

Remove the WL12XX_HT configuration.

Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 07bcb1548d8b2e51ec758372d7ec0a5b52fcbc2d..3fe388b87c2e339204833eff359eb22b6a0ccba7 100644 (file)
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -19,16 +19,6 @@ config WL12XX
          If you choose to build a module, it will be called wl12xx. Say N if
          unsure.
 
-config WL12XX_HT
-        bool "TI wl12xx 802.11 HT support (EXPERIMENTAL)"
-        depends on WL12XX && EXPERIMENTAL
-        default n
-        ---help---
-          This will enable 802.11 HT support in the wl12xx module.
-
-         That configuration is temporary due to the code incomplete and
-         still in testing process.
-
 config WL12XX_SPI
        tristate "TI wl12xx SPI support"
        depends on WL12XX && SPI_MASTER

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index aeb4cc51bd3b50e0feabac95d49a99be7f9ddc2f..e5b871c5c5211d6cfabdd96bce35c63796104d11 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -4084,7 +4084,6 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
 /* 11n STA capabilities */
 #define HW_RX_HIGHEST_RATE     72
 
-#ifdef CONFIG_WL12XX_HT
 #define WL12XX_HT_CAP { \
        .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | \
               (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT), \
@@ -4097,11 +4096,6 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
                .tx_params = IEEE80211_HT_MCS_TX_DEFINED, \
                }, \
 }
-#else
-#define WL12XX_HT_CAP { \
-       .ht_supported = false, \
-}
-#endif
 
 /* can't be const, mac80211 writes to this */
 static struct ieee80211_supported_band wl1271_band_2ghz = {

diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c
index 9074625853b2370a8354c7f96c423f0f8ef6952d..dee4cfe9ccc1ed87a9979418e12bfc1f46ace708 100644 (file)
--- a/drivers/net/wireless/wl12xx/rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -66,11 +66,9 @@ static void wl1271_rx_status(struct wl1271 *wl,
 
        status->rate_idx = wl1271_rate_to_idx(desc->rate, status->band);
 
-#ifdef CONFIG_WL12XX_HT
        /* 11n support */
        if (desc->rate <= CONF_HW_RXTX_RATE_MCS0)
                status->flag |= RX_FLAG_HT;
-#endif
 
        status->signal = desc->rssi;
 

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 08227e69616b0d93ca56135d20529a5d4465a4ff..b8dbc6d1ff98b1caac4dec4a3e37e1396cca6ab1 100644 (file)
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -453,7 +453,6 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set)
                rate_set >>= 1;
        }
 
-#ifdef CONFIG_WL12XX_HT
        /* MCS rates indication are on bits 16 - 23 */
        rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
 
@@ -462,7 +461,6 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set)
                        enabled_rates |= (CONF_HW_BIT_RATE_MCS_0 << bit);
                rate_set >>= 1;
        }
-#endif
 
        return enabled_rates;
 }