2009-03-30 18:20:42

by Geoff Levand

[permalink] [raw]
Subject: [patch] net/ps3: Fix wireless AP connect error handling

From: Masakazu Mokuno <[email protected]>

This patch fixes the bug that the driver tries to continue to
connect(associate) to AP even if gelic_wl_do_{wpa,wep}_setup() fails,

Signed-off-by: Masakazu Mokuno <[email protected]>
Signed-off-by: Geoff Levand <[email protected]>
---
drivers/net/ps3_gelic_wireless.c | 3 +++
1 file changed, 3 insertions(+)

--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -2101,6 +2101,9 @@ static int gelic_wl_associate_bss(struct
if (ret) {
pr_debug("%s: WEP/WPA setup failed %d\n", __func__,
ret);
+ ret = -EPERM;
+ gelic_wl_send_iwap_event(wl, NULL);
+ goto out;
}

/* start association */





2009-04-24 20:15:54

by John W. Linville

[permalink] [raw]
Subject: Re: [patch] net/ps3: Fix wireless AP connect error handling

On Thu, Apr 23, 2009 at 03:46:17PM -0700, Geoff Levand wrote:
> From: Masakazu Mokuno <[email protected]>
>
> This patch fixes the bug that the driver tries to continue to
> connect(associate) to AP even if gelic_wl_do_{wpa,wep}_setup() fails,
>
> Signed-off-by: Masakazu Mokuno <[email protected]>
> Signed-off-by: Geoff Levand <[email protected]>
> ---
> Hi John,
>
> I didn't see this get merged in to 2.6.30 yet. Could you let me know the status?
>
> -Geoff

I have it queued for 2.6.31. Does it cause a crash or other problem
serious enough to merit pushing it for 2.6.30?

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

2009-04-24 20:58:51

by Geoff Levand

[permalink] [raw]
Subject: Re: [patch] net/ps3: Fix wireless AP connect error handling

Hi,

On 04/24/2009 01:14 PM, John W. Linville wrote:
> On Thu, Apr 23, 2009 at 03:46:17PM -0700, Geoff Levand wrote:
>> From: Masakazu Mokuno <[email protected]>
>>
>> This patch fixes the bug that the driver tries to continue to
>> connect(associate) to AP even if gelic_wl_do_{wpa,wep}_setup() fails,
>>
>> Signed-off-by: Masakazu Mokuno <[email protected]>
>> Signed-off-by: Geoff Levand <[email protected]>
>> ---
>> Hi John,
>>
>> I didn't see this get merged in to 2.6.30 yet. Could you let me know the status?
>>
>> -Geoff
>
> I have it queued for 2.6.31. Does it cause a crash or other problem
> serious enough to merit pushing it for 2.6.30?

I saw this was merge to Linus's tree this morning.
Here is the commit: c6dbe17f193c4adc8afc6884f26efb5fa27aa8af

Sorry for the false alarm.

-Geoff


2009-04-23 22:46:25

by Geoff Levand

[permalink] [raw]
Subject: [patch] net/ps3: Fix wireless AP connect error handling

From: Masakazu Mokuno <[email protected]>

This patch fixes the bug that the driver tries to continue to
connect(associate) to AP even if gelic_wl_do_{wpa,wep}_setup() fails,

Signed-off-by: Masakazu Mokuno <[email protected]>
Signed-off-by: Geoff Levand <[email protected]>
---
Hi John,

I didn't see this get merged in to 2.6.30 yet. Could you let me know the status?

-Geoff

drivers/net/ps3_gelic_wireless.c | 3 +++
1 file changed, 3 insertions(+)

--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -2101,6 +2101,9 @@ static int gelic_wl_associate_bss(struct
if (ret) {
pr_debug("%s: WEP/WPA setup failed %d\n", __func__,
ret);
+ ret = -EPERM;
+ gelic_wl_send_iwap_event(wl, NULL);
+ goto out;
}

/* start association */