Browse Source

mwifiex: simplify ad hoc join capability info

While preparing an ad-hoc start command, the capability info bitmap is
needlessly set from the command, and then the ESS bit cleared.

Change to set the bitmap directly without reference to the command.

Signed-off-by: James Cameron <quozl@laptop.org>
Acked-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
James Cameron 10 years ago
parent
commit
4eed83a252
1 changed files with 1 additions and 3 deletions
  1. 1 3
      drivers/net/wireless/mwifiex/join.c

+ 1 - 3
drivers/net/wireless/mwifiex/join.c

@@ -880,9 +880,7 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
 
 
 	/* Set Capability info */
 	/* Set Capability info */
 	bss_desc->cap_info_bitmap |= WLAN_CAPABILITY_IBSS;
 	bss_desc->cap_info_bitmap |= WLAN_CAPABILITY_IBSS;
-	tmp_cap = le16_to_cpu(adhoc_start->cap_info_bitmap);
-	tmp_cap &= ~WLAN_CAPABILITY_ESS;
-	tmp_cap |= WLAN_CAPABILITY_IBSS;
+	tmp_cap = WLAN_CAPABILITY_IBSS;
 
 
 	/* Set up privacy in bss_desc */
 	/* Set up privacy in bss_desc */
 	if (priv->sec_info.encryption_mode) {
 	if (priv->sec_info.encryption_mode) {