Merge lp:~poliva/ubuntu/precise/wpasupplicant/fix-for-994739 into lp:ubuntu/precise/wpasupplicant

[Pau Oliva]

Add a workaround for Broadcom wl driver's first failing scan (LP: #994739)

Add a workaround for Broadcom wl driver's first failing scan (LP: #994739)

[Mathieu Trudel-Lapierre (cyphermox)]

.pc/applied-patches and debian/patches/series list fix_driver_wext_for_broadcom_wl.patch; but it's not shown in the diff. I think you may have forgotten to bzr add that new file :)

Otherwise it looks right in principle, but we ought to have this patch applied in Quantal first. It should be trivial anyway and totally reproduceable there. I wish this patch was accepted upstream as well, but it probably just needs to be brought up on the ML again.

I'll gladly sponsor this to quantal and precise once the missing file is added and same behavior can be confirmed in Quantal; which should be the case anyway. Coordination for that test is being done on bug 994739.

review: Needs Fixing

[lp:~poliva/ubuntu/precise/wpasupplicant/fix-for-994739]

20. By Pau Oliva on 2012-06-20

Add missing patch file fix_driver_wext_for_broadcom_wl.patch

[Pau Oliva (poliva)]

Sorry, never used bzr before, my fault!
The patch file has been added in the previous commit.

[Mathieu Trudel-Lapierre (cyphermox)]

You didn't really need a second entry to changelog though... :)

I'll fix this myself in the merge.

[Mathieu Trudel-Lapierre (cyphermox)]

Sorry for only getting around to looking at the merge now... :/

It turns out that there's actually a small issue: could you please re-do your merge against the ubuntu:wpa branch? That's now what wpasupplicant is called. The files should be in the same location, and you changelog can be something as simple as this:

 * debian/patches/fix_driver_wext_for_broadcom_wl.patch: Add a workaround for
   Broadcom wl driver's first failing scan (LP: #994739)

Or I'll be happy to make the changes for you, just giving you a chance to prepare everything from start to finish ;)

review: Needs Fixing

[Stéphane Graber (stgraber)]

Marking as Work in progress as either Pau or Mathieu need to rebase that change on ubuntu:wpa.

[Pau Oliva (poliva)]

Just done here:
https://code.launchpad.net/~poliva/ubuntu/quantal/wpa/quantal/

I hope it is correct this time, thanks for your patience! :)

[Stéphane Graber (stgraber)]

Marking this one rejected. Review will continue in the other one.

Unmerged revisions

20. By Pau Oliva on 2012-06-20

Add missing patch file fix_driver_wext_for_broadcom_wl.patch

19. By Pau Oliva on 2012-05-21

Add a workaround for Broadcom wl driver's first failing scan (LP: #994739)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-02-16 16:21:29 +0000
+++ .pc/applied-patches	2012-06-21 06:49:18 +0000
@@ -8,3 +8,4 @@
 hostap_allow-linking-with-libnl-3.2.patch
 for-MS-CHAP-convert-the-password-from-UTF-8-to-UCS-2.patch
 dbus-activation-cmdline.patch
+fix_driver_wext_for_broadcom_wl.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-16 09:55:12 +0000
+++ debian/changelog	2012-06-21 06:49:18 +0000
@@ -1,3 +1,15 @@
+wpasupplicant (0.7.3-6ubuntu4) quantal; urgency=low
+
+  * Add missing patch file fix_driver_wext_for_broadcom_wl.patch
+
+ -- Pau Oliva Fora (pof) <[e-mail]>  Wed, 20 Jun 2012 19:24:29 +0200
+
+wpasupplicant (0.7.3-6ubuntu3) quantal; urgency=low
+
+  * Add a workaround for Broadcom wl driver's first failing scan (LP: #994739) 
+
+ -- Pau Oliva Fora (pof) <[e-mail]>  Mon, 21 May 2012 22:36:22 +0200
+
 wpasupplicant (0.7.3-6ubuntu2) precise; urgency=low
 
   * debian/wpasupplicant.postinst: don't fail package configuration if the

=== added file 'debian/patches/fix_driver_wext_for_broadcom_wl.patch'
--- debian/patches/fix_driver_wext_for_broadcom_wl.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_driver_wext_for_broadcom_wl.patch	2012-06-21 06:49:18 +0000
@@ -0,0 +1,62 @@
+From: Pau Oliva <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/994739
+Origin: other, http://lists.shmoo.com/pipermail/hostap/2011-March/022891.html
+Subject: fix driver_wext for broadcom wl driver
+
+With broadcom's "wl" driver the first scan after ifup always fails with
+EINVAL. This produces a 30 seconds timeout when establishing a connection
+either on boot, or after resuming from suspend.
+This is a workaround to wext driver which will rerun the scan if first
+scan fails EINVAL.
+
+--- wpasupplicant-0.7.3.orig/src/drivers/driver_wext.c
++++ wpasupplicant-0.7.3/src/drivers/driver_wext.c
+@@ -733,6 +733,8 @@ void * wpa_driver_wext_init(void *ctx, c
+ 
+ 	drv->mlme_sock = -1;
+ 
++	drv->scans = 0;
++
+ 	if (wpa_driver_wext_finish_drv_init(drv) < 0)
+ 		goto err3;
+ 
+@@ -916,10 +918,13 @@ int wpa_driver_wext_scan(void *priv, str
+ static u8 * wpa_driver_wext_giwscan(struct wpa_driver_wext_data *drv,
+ 				    size_t *len)
+ {
++	struct wpa_driver_scan_params params;
+ 	struct iwreq iwr;
+ 	u8 *res_buf;
+ 	size_t res_buf_len;
+ 
++	drv->scans++;
++
+ 	res_buf_len = IW_SCAN_MAX_DATA;
+ 	for (;;) {
+ 		res_buf = os_malloc(res_buf_len);
+@@ -942,6 +947,15 @@ static u8 * wpa_driver_wext_giwscan(stru
+ 			wpa_printf(MSG_DEBUG, "Scan results did not fit - "
+ 				   "trying larger buffer (%lu bytes)",
+ 				   (unsigned long) res_buf_len);
++		} if (errno == EINVAL && drv->scans == 1) {
++			/*
++			 * Broadcom's wl driver is buggy and the first scan
++			 * after ifup always fail with EINVAL. Rerun the
++			 * scan to get scan results.
++			 */
++			os_memset(&params, 0, sizeof(params));
++			wpa_driver_wext_scan(drv, &params);
++			return NULL;
+ 		} else {
+ 			perror("ioctl[SIOCGIWSCAN]");
+ 			os_free(res_buf);
+--- wpasupplicant-0.7.3.orig/src/drivers/driver_wext.h
++++ wpasupplicant-0.7.3/src/drivers/driver_wext.h
+@@ -42,6 +42,7 @@ struct wpa_driver_wext_data {
+ 
+ 	char mlmedev[IFNAMSIZ + 1];
+ 
++	int scans;
+ 	int scan_complete_events;
+ 
+ 	int cfg80211; /* whether driver is using cfg80211 */

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-16 16:21:29 +0000
+++ debian/patches/series	2012-06-21 06:49:18 +0000
@@ -8,3 +8,4 @@
 hostap_allow-linking-with-libnl-3.2.patch
 for-MS-CHAP-convert-the-password-from-UTF-8-to-UCS-2.patch
 dbus-activation-cmdline.patch
+fix_driver_wext_for_broadcom_wl.patch

=== modified file 'src/drivers/driver_wext.c'
--- src/drivers/driver_wext.c	2011-04-17 21:07:58 +0000
+++ src/drivers/driver_wext.c	2012-06-21 06:49:18 +0000
@@ -733,6 +733,8 @@
 
 	drv->mlme_sock = -1;
 
+	drv->scans = 0;
+
 	if (wpa_driver_wext_finish_drv_init(drv) < 0)
 		goto err3;
 
@@ -916,10 +918,13 @@
 static u8 * wpa_driver_wext_giwscan(struct wpa_driver_wext_data *drv,
 				    size_t *len)
 {
+	struct wpa_driver_scan_params params;
 	struct iwreq iwr;
 	u8 *res_buf;
 	size_t res_buf_len;
 
+	drv->scans++;
+
 	res_buf_len = IW_SCAN_MAX_DATA;
 	for (;;) {
 		res_buf = os_malloc(res_buf_len);
@@ -942,6 +947,15 @@
 			wpa_printf(MSG_DEBUG, "Scan results did not fit - "
 				   "trying larger buffer (%lu bytes)",
 				   (unsigned long) res_buf_len);
+		} if (errno == EINVAL && drv->scans == 1) {
+			/*
+			 * Broadcom's wl driver is buggy and the first scan
+			 * after ifup always fail with EINVAL. Rerun the
+			 * scan to get scan results.
+			 */
+			os_memset(&params, 0, sizeof(params));
+			wpa_driver_wext_scan(drv, &params);
+			return NULL;
 		} else {
 			perror("ioctl[SIOCGIWSCAN]");
 			os_free(res_buf);

=== modified file 'src/drivers/driver_wext.h'
--- src/drivers/driver_wext.h	2011-04-17 21:07:58 +0000
+++ src/drivers/driver_wext.h	2012-06-21 06:49:18 +0000
@@ -42,6 +42,7 @@
 
 	char mlmedev[IFNAMSIZ + 1];
 
+	int scans;
 	int scan_complete_events;
 
 	int cfg80211; /* whether driver is using cfg80211 */