aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/join.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/join.c')
-rw-r--r--drivers/net/wireless/mwifiex/join.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 98d76d8c2656..8ffb6a8d1036 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