commit b93f85f0fb019f527b68569aafb836c94b89a47e
author Bing Zhao <bzhao@marvell.com> Fri Mar 25 19:47:01 2011 -0700
committer John W. Linville <linville@tuxdriver.com> Mon Apr 04 16:20:00 2011 -0400
tree 81704dca7b4450f3387c75ebfce9f2b063f704ba
parent 5f9f1812b68a2979bc97399cd4954f1c191986af

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>

drivers/net/wireless/mwifiex/join.c

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 98d76d8..8ffb6a8 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -517,7 +517,7 @@
 	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 @@
 			     + 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);