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

Commit 33f38d42 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: fix ht_cap_info in ibss beacons 



A local variable is used to calculate ht_cap_info.
Erroneously ht_cap.cap_info isn't updated in the ibss beacons
after the calculation. This patch fixes it.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d64cf63e

drivers/net/wireless/mwifiex/join.c

+2 −2
Original line number Diff line number Diff line
@@ -922,15 +922,15 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv, 
				cpu_to_le16(WLAN_EID_HT_CAPABILITY);

			ht_cap->header.len =

			       cpu_to_le16(sizeof(struct ieee80211_ht_cap));

			ht_cap_info = le16_to_cpu(ht_cap->ht_cap.cap_info);



			ht_cap_info |= IEEE80211_HT_CAP_SGI_20;

			ht_cap_info = IEEE80211_HT_CAP_SGI_20;

			if (adapter->chan_offset) {

				ht_cap_info |= IEEE80211_HT_CAP_SGI_40;

				ht_cap_info |= IEEE80211_HT_CAP_DSSSCCK40;

				ht_cap_info |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;

				SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);

			}

			ht_cap->ht_cap.cap_info = cpu_to_le16(ht_cap_info);



			ht_cap->ht_cap.ampdu_params_info

					= IEEE80211_HT_MAX_AMPDU_64K;