2011-11-08 13:54:57

by Eyal Shapira

[permalink] [raw]
Subject: [PATCH] wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are in filters

A minor fix for the check that verifies that all given SSIDs (in req) exist
in the filters (the match sets)

Signed-off-by: Eyal Shapira <[email protected]>
---
drivers/net/wireless/wl12xx/scan.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 128ccb7..fc29c67 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -559,7 +559,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
break;
}
/* Fail if SSID isn't present in the filters */
- if (j == req->n_ssids) {
+ if (j == cmd->n_ssids) {
ret = -EINVAL;
goto out_free;
}
--
1.7.4.1



2011-11-08 14:06:33

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are in filters

On Tue, 2011-11-08 at 15:54 +0200, Eyal Shapira wrote:
> A minor fix for the check that verifies that all given SSIDs (in req) exist
> in the filters (the match sets)
>
> Signed-off-by: Eyal Shapira <[email protected]>
> ---
> drivers/net/wireless/wl12xx/scan.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
> index 128ccb7..fc29c67 100644
> --- a/drivers/net/wireless/wl12xx/scan.c
> +++ b/drivers/net/wireless/wl12xx/scan.c
> @@ -559,7 +559,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
> break;
> }
> /* Fail if SSID isn't present in the filters */
> - if (j == req->n_ssids) {
> + if (j == cmd->n_ssids) {
> ret = -EINVAL;
> goto out_free;
> }

Just to clarify. My comment:
> Acked-by: Luciano Coelho <[email protected]>
>
> John, can you apply this to 3.2, please?

...was about this patch. Eyal's email was delivered to me, but vger
rejected it, so he had to resend it.

--
Cheers,
Luca.


2011-11-08 14:15:14

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH] wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are in filters

On Tue, Nov 08, 2011 at 02:47:59PM +0200, Luciano Coelho wrote:
> On Tue, 2011-11-08 at 14:42 +0200, Eyal Shapira wrote:
> > A minor fix for the check that verifies that all given SSIDs (in req) exist
> > in the filters (the match sets)
> >
> > Signed-off-by: Eyal Shapira <[email protected]>
> > ---
>
> Acked-by: Luciano Coelho <[email protected]>
>
> John, can you apply this to 3.2, please?

Can someone bounce me a fresh copy? :-)

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2011-11-08 12:48:04

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCH] wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are in filters

On Tue, 2011-11-08 at 14:42 +0200, Eyal Shapira wrote:
> A minor fix for the check that verifies that all given SSIDs (in req) exist
> in the filters (the match sets)
>
> Signed-off-by: Eyal Shapira <[email protected]>
> ---

Acked-by: Luciano Coelho <[email protected]>

John, can you apply this to 3.2, please?

--
Cheers,
Luca.


2011-11-08 14:15:14

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH] wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are in filters

On Tue, Nov 08, 2011 at 04:06:28PM +0200, Luciano Coelho wrote:
> On Tue, 2011-11-08 at 15:54 +0200, Eyal Shapira wrote:
> > A minor fix for the check that verifies that all given SSIDs (in req) exist
> > in the filters (the match sets)
> >
> > Signed-off-by: Eyal Shapira <[email protected]>
> > ---
> > drivers/net/wireless/wl12xx/scan.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
> > index 128ccb7..fc29c67 100644
> > --- a/drivers/net/wireless/wl12xx/scan.c
> > +++ b/drivers/net/wireless/wl12xx/scan.c
> > @@ -559,7 +559,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
> > break;
> > }
> > /* Fail if SSID isn't present in the filters */
> > - if (j == req->n_ssids) {
> > + if (j == cmd->n_ssids) {
> > ret = -EINVAL;
> > goto out_free;
> > }
>
> Just to clarify. My comment:
> > Acked-by: Luciano Coelho <[email protected]>
> >
> > John, can you apply this to 3.2, please?
>
> ...was about this patch. Eyal's email was delivered to me, but vger
> rejected it, so he had to resend it.

OK, I got it. :-)

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.