aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mwifiex/fw.h3
-rw-r--r--drivers/net/wireless/mwifiex/join.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index d1a5a10c2a8..410be694e36 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -57,9 +57,6 @@ struct tx_packet_hdr {
57#define GET_FW_DEFAULT_BANDS(adapter) \ 57#define GET_FW_DEFAULT_BANDS(adapter) \
58 ((adapter->fw_cap_info >> 8) & ALL_802_11_BANDS) 58 ((adapter->fw_cap_info >> 8) & ALL_802_11_BANDS)
59 59
60#define SHORT_SLOT_TIME_DISABLED(CapInfo) (CapInfo &= ~BIT(10))
61#define SHORT_SLOT_TIME_ENABLED(CapInfo) (CapInfo |= BIT(10))
62
63extern u8 supported_rates_b[B_SUPPORTED_RATES]; 60extern u8 supported_rates_b[B_SUPPORTED_RATES];
64extern u8 supported_rates_g[G_SUPPORTED_RATES]; 61extern u8 supported_rates_g[G_SUPPORTED_RATES];
65extern u8 supported_rates_bg[BG_SUPPORTED_RATES]; 62extern u8 supported_rates_bg[BG_SUPPORTED_RATES];
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 98d76d8c265..8ffb6a8d103 100644
--- 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,
517 tmp_cap = bss_desc->cap_info_bitmap; 517 tmp_cap = bss_desc->cap_info_bitmap;
518 518
519 if (priv->adapter->config_bands == BAND_B) 519 if (priv->adapter->config_bands == BAND_B)
520 SHORT_SLOT_TIME_DISABLED(tmp_cap); 520 tmp_cap &= ~WLAN_CAPABILITY_SHORT_SLOT_TIME;
521 521
522 tmp_cap &= CAPINFO_MASK; 522 tmp_cap &= CAPINFO_MASK;
523 dev_dbg(priv->adapter->dev, "info: ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", 523 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,
1015 + S_DS_GEN + cmd_append_size)); 1015 + S_DS_GEN + cmd_append_size));
1016 1016
1017 if (adapter->adhoc_start_band == BAND_B) 1017 if (adapter->adhoc_start_band == BAND_B)
1018 SHORT_SLOT_TIME_DISABLED(tmp_cap); 1018 tmp_cap &= ~WLAN_CAPABILITY_SHORT_SLOT_TIME;
1019 else 1019 else
1020 SHORT_SLOT_TIME_ENABLED(tmp_cap); 1020 tmp_cap |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
1021 1021
1022 adhoc_start->cap_info_bitmap = cpu_to_le16(tmp_cap); 1022 adhoc_start->cap_info_bitmap = cpu_to_le16(tmp_cap);
1023 1023