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

Commit d5124648 authored Mar 04, 2014 by Amitkumar Karwar Committed by John W. Linville Mar 06, 2014

mwifiex: save and copy AP's VHT capability info correctly



While preparing association request, intersection of device's
VHT capability information and corresponding field advertised
by AP is used.

This patch fixes a couple errors while saving and copying vht_cap
and vht_oper fields from AP's beacon.

Cc: <stable@vger.kernel.org> # 3.9+
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c99b1861

drivers/net/wireless/mwifiex/11ac.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -189,8 +189,7 @@ int mwifiex_cmd_append_11ac_tlv(struct mwifiex_private *priv,
		vht_cap->header.len =
		cpu_to_le16(sizeof(struct ieee80211_vht_cap));
		memcpy((u8 *)vht_cap + sizeof(struct mwifiex_ie_types_header),
		(u8 *)bss_desc->bcn_vht_cap +
		sizeof(struct ieee_types_header),
		(u8 *)bss_desc->bcn_vht_cap,
		le16_to_cpu(vht_cap->header.len));

		mwifiex_fill_vht_cap_tlv(priv, vht_cap, bss_desc->bss_band);

drivers/net/wireless/mwifiex/scan.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2101,11 +2101,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
		curr_bss->ht_info_offset);

		if (curr_bss->bcn_vht_cap)
		curr_bss->bcn_ht_cap = (void *)(curr_bss->beacon_buf +
		curr_bss->bcn_vht_cap = (void *)(curr_bss->beacon_buf +
		curr_bss->vht_cap_offset);

		if (curr_bss->bcn_vht_oper)
		curr_bss->bcn_ht_oper = (void *)(curr_bss->beacon_buf +
		curr_bss->bcn_vht_oper = (void *)(curr_bss->beacon_buf +
		curr_bss->vht_info_offset);

		if (curr_bss->bcn_bss_co_2040)