Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b93f85f0 authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

mwifiex: remove macro SHORT_SLOT_TIME_DISABLED 



and SHORT_SLOT_TIME_ENABLED.
Use WLAN_CAPABILITY_SHORT_SLOT_TIME instead.

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5f9f1812

drivers/net/wireless/mwifiex/fw.h

+0 −3
Original line number Diff line number Diff line
@@ -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];

drivers/net/wireless/mwifiex/join.c

+3 −3
Original line number Diff line number Diff line
@@ -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);