diff options
| author |   Masakazu Mokuno <mokuno@sm.sony.co.jp> | 2009-03-30 11:04:36 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-04-16 10:39:06 -0400 |
| commit | c6dbe17f193c4adc8afc6884f26efb5fa27aa8af (patch) | |
| tree | 43e5ca635fc80f2c373760ec2089cac513092526 /drivers/net/ps3_gelic_wireless.c | |
| parent | p54spi: fix locking warning in p54spi_op_tx (diff) | |
| download | linux-dev-c6dbe17f193c4adc8afc6884f26efb5fa27aa8af.tar.xz linux-dev-c6dbe17f193c4adc8afc6884f26efb5fa27aa8af.zip | |
net/ps3: Fix wireless AP connect error handling
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/ps3_gelic_wireless.c')
| -rw-r--r-- | drivers/net/ps3_gelic_wireless.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index a5ac2bd58b5b..4f3ada622f9b 100644 --- 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 gelic_wl_info *wl, 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 */ |