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

From: Geoff Levand <[email-masked]>
Date: Thu, 23 Apr 2009 15:46:17 -0700

From: Masakazu Mokuno <[email-masked]>

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-masked]>
Signed-off-by: Geoff Levand <[email-masked]>
---
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 */