korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 12:34:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mwifiex: simplify ad hoc join capability info

Browse Source 
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>
This commit is contained in:
James Cameron 2014-11-11 16:21:28 +11:00 committed by John W. Linville
parent d351f5fea4
commit 4eed83a252
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/mwifiex/join.c
View File

@ -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_IBSS;
tmp_cap &= ~WLAN_CAPABILITY_ESS;
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) {