Linux wireless drivers development
 help / color / mirror / Atom feed
From: Bing Zhao <bzhao@marvell.com>
To: linux-wireless@vger.kernel.org
Cc: "John W. Linville" <linville@tuxdriver.com>,
	Amitkumar Karwar <akarwar@marvell.com>,
	Kiran Divekar <dkiran@marvell.com>,
	Yogesh Powar <yogeshp@marvell.com>,
	Frank Huang <frankh@marvell.com>, Bing Zhao <bzhao@marvell.com>
Subject: [PATCH 1/7] mwifiex: fix ht_cap_info in ibss beacons
Date: Mon,  7 Nov 2011 21:41:06 -0800	[thread overview]
Message-ID: <1320730872-25619-2-git-send-email-bzhao@marvell.com> (raw)
In-Reply-To: <1320730872-25619-1-git-send-email-bzhao@marvell.com>

From: Yogesh Ashok Powar <yogeshp@marvell.com>

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>
---
 drivers/net/wireless/mwifiex/join.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 62b4c29..062716c 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -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;
-- 
1.7.0.2


  reply	other threads:[~2011-11-08  5:41 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-08  5:41 [PATCH 0/7] mwifiex: patch series for 3.3 Bing Zhao
2011-11-08  5:41 ` Bing Zhao [this message]
2011-11-08  5:41 ` [PATCH 2/7] mwifiex: use existing helper function mwifiex_fill_cap_info Bing Zhao
2011-11-08  5:41 ` [PATCH 3/7] mwifiex: change return types to void Bing Zhao
2011-11-08  5:41 ` [PATCH 4/7] mwifiex: fix coding style Bing Zhao
2011-11-08  5:41 ` [PATCH 5/7] mwifiex: fix 'Smatch' warnings Bing Zhao
2011-11-08  5:41 ` [PATCH 6/7] mwifiex: remove unnecessary free_priv handler Bing Zhao
2011-11-08  5:41 ` [PATCH 7/7] mwifiex: release bss structure returned by cfg80211_inform_bss() Bing Zhao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320730872-25619-2-git-send-email-bzhao@marvell.com \
    --to=bzhao@marvell.com \
    --cc=akarwar@marvell.com \
    --cc=dkiran@marvell.com \
    --cc=frankh@marvell.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=yogeshp@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox