OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
731c653
)
net/ps3: Fix wireless AP connect error handling
author
Masakazu Mokuno
<mokuno@sm.sony.co.jp>
Mon, 30 Mar 2009 18:04:36 +0000
(11:04 -0700)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 16 Apr 2009 14:39:06 +0000
(10:39 -0400)
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>
drivers/net/ps3_gelic_wireless.c
patch
|
blob
|
history
diff --git
a/drivers/net/ps3_gelic_wireless.c
b/drivers/net/ps3_gelic_wireless.c
index
a5ac2bd
..
4f3ada6
100644
(file)
--- 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 */