diff mbox

net/ps3: Fix wireless AP connect error handling

Message ID 49F0EFB9.20709@am.sony.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Geoff Levand April 23, 2009, 10:46 p.m. UTC 
From: Masakazu Mokuno <mokuno@sm.sony.co.jp>

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 <mokuno@sm.sony.co.jp>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---
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(+)





--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

John W. Linville April 24, 2009, 8:14 p.m. UTC | #1 
On Thu, Apr 23, 2009 at 03:46:17PM -0700, Geoff Levand wrote:
> From: Masakazu Mokuno <mokuno@sm.sony.co.jp>
> 
> 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 <mokuno@sm.sony.co.jp>
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
> ---
> 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
Geoff Levand April 24, 2009, 8:58 p.m. UTC | #2 
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 <mokuno@sm.sony.co.jp>
>> 
>> 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 <mokuno@sm.sony.co.jp>
>> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
>> ---
>> 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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 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 */