Return-path: Received: from outbound-sin.frontbridge.com ([207.46.51.80]:30669 "EHLO SG2EHSOBE004.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515AbZDWWqZ (ORCPT ); Thu, 23 Apr 2009 18:46:25 -0400 Message-ID: <49F0EFB9.20709@am.sony.com> (sfid-20090424_004631_291779_CB811CA9) Date: Thu, 23 Apr 2009 15:46:17 -0700 From: Geoff Levand MIME-Version: 1.0 To: linville@tuxdriver.com CC: jgarzik@pobox.com, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Masakazu Mokuno Subject: [patch] net/ps3: Fix wireless AP connect error handling References: <49D109B4.7020808@am.sony.com> In-Reply-To: <49D109B4.7020808@am.sony.com> Content-Type: text/plain; charset="ISO-8859-1" Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Masakazu Mokuno 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 Signed-off-by: Geoff Levand --- 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 */