Skip to content

Commit

Permalink
mwifiex: fix ht_cap_info in ibss beacons
Browse files Browse the repository at this point in the history
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: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Yogesh Ashok Powar authored and John W. Linville committed Nov 11, 2011
1 parent d64cf63 commit 33f38d4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/mwifiex/join.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 33f38d4

Please sign in to comment.