Merge lp:~ubuntu-branches/ubuntu/quantal/wpa/quantal-201207091727 into lp:ubuntu/quantal/wpa

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/wpa reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/wpa/quantal-201207091727. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

4. By Mathieu Trudel-Lapierre on 2012-07-09

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

=== 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-07-09 17:33:09 +0000
@@ -0,0 +1,66 @@
+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.
+
+Index: wpa/src/drivers/driver_wext.c
+===================================================================
+--- wpa.orig/src/drivers/driver_wext.c	2012-07-09 16:41:16.328347000 +0200
++++ wpa/src/drivers/driver_wext.c	2012-07-09 16:42:18.149589666 +0200
+@@ -855,6 +855,8 @@
+ 
+ 	drv->mlme_sock = -1;
+ 
++	drv->scans = 0;
++
+ 	if (wpa_driver_wext_finish_drv_init(drv) < 0)
+ 		goto err3;
+ 
+@@ -1064,10 +1066,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);
+@@ -1090,6 +1095,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);
+Index: wpa/src/drivers/driver_wext.h
+===================================================================
+--- wpa.orig/src/drivers/driver_wext.h	2012-07-09 16:41:16.328347000 +0200
++++ wpa/src/drivers/driver_wext.h	2012-07-09 16:42:18.149589666 +0200
+@@ -45,6 +45,7 @@
+ 
+ 	char mlmedev[IFNAMSIZ + 1];
+ 
++	int scans;
+ 	int scan_complete_events;
+ 
+ 	int cfg80211; /* whether driver is using cfg80211 */

=== renamed file 'debian/patches/fix_driver_wext_for_broadcom_wl.patch' => 'debian/patches/fix_driver_wext_for_broadcom_wl.patch.moved'