* [PATCH 3.3] mwifiex: reset encryption mode flag before association
@ 2012-02-25 5:35 Bing Zhao
2012-02-25 5:35 ` [PATCH 3.3] mwifiex: remove redundant scan operation Bing Zhao
2012-02-27 18:23 ` [PATCH 3.3] mwifiex: reset encryption mode flag before association John W. Linville
0 siblings, 2 replies; 6+ messages in thread
From: Bing Zhao @ 2012-02-25 5:35 UTC (permalink / raw)
To: linux-wireless
Cc: John W. Linville, Amitkumar Karwar, Kiran Divekar, Yogesh Powar,
Avinash Patil, Frank Huang, Bing Zhao
From: Amitkumar Karwar <akarwar@marvell.com>
Recent commit
"mwifiex: clear previous security setting during association"
fixes association failure problems observed in some corner cases
by clearing previous security setting before each association.
We should reset encryption mode flag as well. This patch takes care
of it.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
---
drivers/net/wireless/mwifiex/cfg80211.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 8d8ee63..e4e6d7d 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
priv->sec_info.wpa_enabled = false;
priv->sec_info.wpa2_enabled = false;
priv->wep_key_curr_index = 0;
+ priv->sec_info.encryption_mode = 0;
ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
if (mode == NL80211_IFTYPE_ADHOC) {
--
1.7.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3.3] mwifiex: remove redundant scan operation
2012-02-25 5:35 [PATCH 3.3] mwifiex: reset encryption mode flag before association Bing Zhao
@ 2012-02-25 5:35 ` Bing Zhao
2012-02-27 18:23 ` John W. Linville
2012-02-27 18:23 ` [PATCH 3.3] mwifiex: reset encryption mode flag before association John W. Linville
1 sibling, 1 reply; 6+ messages in thread
From: Bing Zhao @ 2012-02-25 5:35 UTC (permalink / raw)
To: linux-wireless
Cc: John W. Linville, Amitkumar Karwar, Kiran Divekar, Yogesh Powar,
Avinash Patil, Frank Huang, Bing Zhao
From: Amitkumar Karwar <akarwar@marvell.com>
It should have been removed by commit "mwifiex: use cfg80211 dynamic
scan..." (7c6fa2a843..) after adding code to avoid an extra scan
during association because scan entries are valid for 15 seconds in
cfg80211 stack.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
---
drivers/net/wireless/mwifiex/cfg80211.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index e4e6d7d..7b98ce0 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -924,12 +924,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
}
}
done:
- /* Do specific SSID scanning */
- if (mwifiex_request_scan(priv, &req_ssid)) {
- dev_err(priv->adapter->dev, "scan error\n");
- return -EFAULT;
- }
-
/*
* Scan entries are valid for some time (15 sec). So we can save one
* active scan time if we just try cfg80211_get_bss first. If it fails
--
1.7.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3.3] mwifiex: remove redundant scan operation
2012-02-25 5:35 ` [PATCH 3.3] mwifiex: remove redundant scan operation Bing Zhao
@ 2012-02-27 18:23 ` John W. Linville
2012-02-27 23:47 ` Bing Zhao
0 siblings, 1 reply; 6+ messages in thread
From: John W. Linville @ 2012-02-27 18:23 UTC (permalink / raw)
To: Bing Zhao
Cc: linux-wireless, Amitkumar Karwar, Kiran Divekar, Yogesh Powar,
Avinash Patil, Frank Huang
On Fri, Feb 24, 2012 at 09:35:36PM -0800, Bing Zhao wrote:
> From: Amitkumar Karwar <akarwar@marvell.com>
>
> It should have been removed by commit "mwifiex: use cfg80211 dynamic
> scan..." (7c6fa2a843..) after adding code to avoid an extra scan
> during association because scan entries are valid for 15 seconds in
> cfg80211 stack.
>
> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> Signed-off-by: Bing Zhao <bzhao@marvell.com>
> ---
> drivers/net/wireless/mwifiex/cfg80211.c | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
> index e4e6d7d..7b98ce0 100644
> --- a/drivers/net/wireless/mwifiex/cfg80211.c
> +++ b/drivers/net/wireless/mwifiex/cfg80211.c
> @@ -924,12 +924,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
> }
> }
> done:
> - /* Do specific SSID scanning */
> - if (mwifiex_request_scan(priv, &req_ssid)) {
> - dev_err(priv->adapter->dev, "scan error\n");
> - return -EFAULT;
> - }
> -
> /*
> * Scan entries are valid for some time (15 sec). So we can save one
> * active scan time if we just try cfg80211_get_bss first. If it fails
It seems like this could wait to be fixed in 3.4?
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 3.3] mwifiex: remove redundant scan operation
2012-02-27 18:23 ` John W. Linville
@ 2012-02-27 23:47 ` Bing Zhao
0 siblings, 0 replies; 6+ messages in thread
From: Bing Zhao @ 2012-02-27 23:47 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar, Kiran Divekar,
Yogesh Powar, Avinash Patil, Frank Huang
Hi John,
> Subject: Re: [PATCH 3.3] mwifiex: remove redundant scan operation
>
> On Fri, Feb 24, 2012 at 09:35:36PM -0800, Bing Zhao wrote:
> > From: Amitkumar Karwar <akarwar@marvell.com>
> >
> > It should have been removed by commit "mwifiex: use cfg80211 dynamic
> > scan..." (7c6fa2a843..) after adding code to avoid an extra scan
> > during association because scan entries are valid for 15 seconds in
> > cfg80211 stack.
> >
> > Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> > Signed-off-by: Bing Zhao <bzhao@marvell.com>
> > ---
> > drivers/net/wireless/mwifiex/cfg80211.c | 6 ------
> > 1 files changed, 0 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
> > index e4e6d7d..7b98ce0 100644
> > --- a/drivers/net/wireless/mwifiex/cfg80211.c
> > +++ b/drivers/net/wireless/mwifiex/cfg80211.c
> > @@ -924,12 +924,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
> > }
> > }
> > done:
> > - /* Do specific SSID scanning */
> > - if (mwifiex_request_scan(priv, &req_ssid)) {
> > - dev_err(priv->adapter->dev, "scan error\n");
> > - return -EFAULT;
> > - }
> > -
> > /*
> > * Scan entries are valid for some time (15 sec). So we can save one
> > * active scan time if we just try cfg80211_get_bss first. If it fails
>
> It seems like this could wait to be fixed in 3.4?
Yes, this one can be applied for 3.4.
Thanks,
Bing
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3.3] mwifiex: reset encryption mode flag before association
2012-02-25 5:35 [PATCH 3.3] mwifiex: reset encryption mode flag before association Bing Zhao
2012-02-25 5:35 ` [PATCH 3.3] mwifiex: remove redundant scan operation Bing Zhao
@ 2012-02-27 18:23 ` John W. Linville
2012-02-27 23:44 ` Bing Zhao
1 sibling, 1 reply; 6+ messages in thread
From: John W. Linville @ 2012-02-27 18:23 UTC (permalink / raw)
To: Bing Zhao
Cc: linux-wireless, Amitkumar Karwar, Kiran Divekar, Yogesh Powar,
Avinash Patil, Frank Huang
On Fri, Feb 24, 2012 at 09:35:35PM -0800, Bing Zhao wrote:
> From: Amitkumar Karwar <akarwar@marvell.com>
>
> Recent commit
> "mwifiex: clear previous security setting during association"
> fixes association failure problems observed in some corner cases
> by clearing previous security setting before each association.
>
> We should reset encryption mode flag as well. This patch takes care
> of it.
>
> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> Signed-off-by: Bing Zhao <bzhao@marvell.com>
> ---
> drivers/net/wireless/mwifiex/cfg80211.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
> index 8d8ee63..e4e6d7d 100644
> --- a/drivers/net/wireless/mwifiex/cfg80211.c
> +++ b/drivers/net/wireless/mwifiex/cfg80211.c
> @@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
> priv->sec_info.wpa_enabled = false;
> priv->sec_info.wpa2_enabled = false;
> priv->wep_key_curr_index = 0;
> + priv->sec_info.encryption_mode = 0;
> ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
>
> if (mode == NL80211_IFTYPE_ADHOC) {
What bug does this fix? Does it need to be fixed in 3.3? Or can it wait for 3.4?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH 3.3] mwifiex: reset encryption mode flag before association
2012-02-27 18:23 ` [PATCH 3.3] mwifiex: reset encryption mode flag before association John W. Linville
@ 2012-02-27 23:44 ` Bing Zhao
0 siblings, 0 replies; 6+ messages in thread
From: Bing Zhao @ 2012-02-27 23:44 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar, Kiran Divekar,
Yogesh Powar, Avinash Patil, Frank Huang
Hi John,
> Subject: Re: [PATCH 3.3] mwifiex: reset encryption mode flag before association
>
> On Fri, Feb 24, 2012 at 09:35:35PM -0800, Bing Zhao wrote:
> > From: Amitkumar Karwar <akarwar@marvell.com>
> >
> > Recent commit
> > "mwifiex: clear previous security setting during association"
> > fixes association failure problems observed in some corner cases
> > by clearing previous security setting before each association.
> >
> > We should reset encryption mode flag as well. This patch takes care
> > of it.
> >
> > Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> > Signed-off-by: Bing Zhao <bzhao@marvell.com>
> > ---
> > drivers/net/wireless/mwifiex/cfg80211.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
> > index 8d8ee63..e4e6d7d 100644
> > --- a/drivers/net/wireless/mwifiex/cfg80211.c
> > +++ b/drivers/net/wireless/mwifiex/cfg80211.c
> > @@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
> > priv->sec_info.wpa_enabled = false;
> > priv->sec_info.wpa2_enabled = false;
> > priv->wep_key_curr_index = 0;
> > + priv->sec_info.encryption_mode = 0;
> > ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
> >
> > if (mode == NL80211_IFTYPE_ADHOC) {
>
> What bug does this fix? Does it need to be fixed in 3.3? Or can it wait for 3.4?
This one line code should be part of this patch:
[PATCH 3.3] mwifiex: clear previous security setting during association (in wireless.git)
They altogether fix an association corner case issue. I'd prefer have it for 3.3.
Of course it's your call if you think that's more suitable for 3.4.
Thanks,
Bing
>
> John
> --
> John W. Linville Someday the world will need a hero, and you
> linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-27 23:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-25 5:35 [PATCH 3.3] mwifiex: reset encryption mode flag before association Bing Zhao
2012-02-25 5:35 ` [PATCH 3.3] mwifiex: remove redundant scan operation Bing Zhao
2012-02-27 18:23 ` John W. Linville
2012-02-27 23:47 ` Bing Zhao
2012-02-27 18:23 ` [PATCH 3.3] mwifiex: reset encryption mode flag before association John W. Linville
2012-02-27 23:44 ` Bing Zhao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).