Skip to contentSkip to conversation

net/ps3: Fix wireless AP connect error handling

PATCH New Geoff Levand 3 participants 4 messages Mar 30, 2009 – Apr 24, 2009 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ps3: Fix wireless AP connect error handling

From: Masakazu Mokuno <[email protected]>

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,

---
 drivers/net/ps3_gelic_wireless.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/net/ps3_gelic_wireless.c +3 -0
@@ -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 */
#1 lore raw

PATCH 1/1 net/ps3: Fix wireless AP connect error handling

From: Masakazu Mokuno <[email protected]>

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,

---
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(+)
drivers/net/ps3_gelic_wireless.c +3 -0
@@ -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 */
#2 lore raw
Quoted 5 lines · Geoff Levand

From: Masakazu Mokuno <[email protected]>

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,

Quoted 8 lines

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

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

Hi,

Quoted 11 lines · John W. Linville
Quoted 10 lines · Geoff Levand

From: Masakazu Mokuno <[email protected]>

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,

---
Hi John,

Quoted 6 lines
Quoted 3 lines

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 linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html