mwifiex: remove macro SHORT_SLOT_TIME_DISABLED

and SHORT_SLOT_TIME_ENABLED.
Use WLAN_CAPABILITY_SHORT_SLOT_TIME instead.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index d1a5a10c2a8e12206e716993fecebad74bfcafe5..410be694e36be6e63faf0e3107784188215dade3 100644 (file)
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -57,9 +57,6 @@ struct tx_packet_hdr {
 #define GET_FW_DEFAULT_BANDS(adapter)  \
        ((adapter->fw_cap_info >> 8) & ALL_802_11_BANDS)
 
-#define SHORT_SLOT_TIME_DISABLED(CapInfo) (CapInfo &= ~BIT(10))
-#define SHORT_SLOT_TIME_ENABLED(CapInfo)  (CapInfo |= BIT(10))
-
 extern u8 supported_rates_b[B_SUPPORTED_RATES];
 extern u8 supported_rates_g[G_SUPPORTED_RATES];
 extern u8 supported_rates_bg[BG_SUPPORTED_RATES];

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 98d76d8c26563ad6a332eb3855a751d7b7944665..8ffb6a8d1036150b6f06e71f52882b45666bb8cf 100644 (file)
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -517,7 +517,7 @@ int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,
        tmp_cap = bss_desc->cap_info_bitmap;
 
        if (priv->adapter->config_bands == BAND_B)
-               SHORT_SLOT_TIME_DISABLED(tmp_cap);
+               tmp_cap &= ~WLAN_CAPABILITY_SHORT_SLOT_TIME;
 
        tmp_cap &= CAPINFO_MASK;
        dev_dbg(priv->adapter->dev, "info: ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n",
@@ -1015,9 +1015,9 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
                             + S_DS_GEN + cmd_append_size));
 
        if (adapter->adhoc_start_band == BAND_B)
-               SHORT_SLOT_TIME_DISABLED(tmp_cap);
+               tmp_cap &= ~WLAN_CAPABILITY_SHORT_SLOT_TIME;
        else
-               SHORT_SLOT_TIME_ENABLED(tmp_cap);
+               tmp_cap |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
 
        adhoc_start->cap_info_bitmap = cpu_to_le16(tmp_cap);