diff options
| author | James Cameron <quozl@laptop.org> | 2014-11-11 16:21:28 +1100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:31:16 -0500 |
| commit | 4eed83a252257ad8ad41ba1c769341960ed4cdc5 (patch) | |
| tree | 386626a31d4236ffc99e5f34f41e24d432fe34f9 /drivers/net/wireless/mwifiex/join.c | |
| parent | d351f5fea44a7527819598070e11b5c9dc53c017 (diff) | |
| download | lwn-4eed83a252257ad8ad41ba1c769341960ed4cdc5.tar.gz lwn-4eed83a252257ad8ad41ba1c769341960ed4cdc5.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/join.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/join.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c index 8d6c25908b6d..411a6c2f4aca 100644 --- a/drivers/net/wireless/mwifiex/join.c +++ b/drivers/net/wireless/mwifiex/join.c @@ -880,9 +880,7 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, /* Set Capability info */ 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 */ if (priv->sec_info.encryption_mode) { |