Updated patch to make it workable with all sys-devel/patch versions.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-777e816 i686

3 files changed, 197 insertions, 164 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index a3fdca43518a..3ae828705929 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.61 2008/10/20 03:11:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.62 2008/10/22 18:25:42 pva Exp $
+
+  22 Oct 2008; Peter Volkov <pva@gentoo.org>
+  files/madwifi-ng-0.9.4-2.6.27-r3811.patch:
+  Updated patch to make it workable with all sys-devel/patch versions.
 
   20 Oct 2008; Peter Volkov <pva@gentoo.org>
   +files/madwifi-ng-0.9.4-2.6.27-r3811.patch, madwifi-ng-0.9.4-r1.ebuild:
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 447f18420ea1..e7a7776d6ff8 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -1,7 +1,7 @@
 AUX madwifi-2.6.22.patch 3591 RMD160 f895c5766eb51369e376cf22674b08f8a6125972 SHA1 41c740a96e46d3c3c0934c1d6b668df4bca0a14f SHA256 a2755a11c630b53d6bb4f3eaf6a641e8edfa6585d86f3fd3c918e26397c20386
 AUX madwifi-dfs-ieee80211-skb-update.patch 453 RMD160 856e6931da9bf96bc993a6f568933d6742f81719 SHA1 41928bbfdbb4e1c1fa5c1ed93fb673542c18bbc3 SHA256 25c4d782cdaac53ae4bf36253b93e27c475fec785043e4d080c83e61eb9c809f
 AUX madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea SHA1 3c84bf4e203ab3c810c734816dd1291ba19b0005 SHA256 be6e7a66acad56044c25ab56d9cbd7d5326c4ba21f5d9ed25caef56a9577bdc8
-AUX madwifi-ng-0.9.4-2.6.27-r3811.patch 5887 RMD160 b463c0fc76daa70cc0d8a906422f07d5e11b4830 SHA1 4052a6e2e93a13f12dd2e4faec531919eb2587ce SHA256 549bba3ff42bf38c19498eef0a0c222b508a203563fe147d45e40777693bae21
+AUX madwifi-ng-0.9.4-2.6.27-r3811.patch 6515 RMD160 6d52c90f5afad8c225a2d23d90af593e4f00b666 SHA1 0f49938eb9a9b523ebb8925a446018010454184b SHA256 d98fc130d1588b599119eda5d3d723f6e7b83201a89ca9c1bac8760042308e41
 AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe
 DIST madwifi-0.9.3.1.tar.bz2 3488269 RMD160 5daad5c17d42ee0b5618d46213293c4d6289130b SHA1 96647476b70ec80c83a13e3d381776416f6ccbff SHA256 623aa90dd9da9c0140ae71d205c6e8cb32f8a555f0f12d873494df05a07945ec
 DIST madwifi-0.9.3.2.tar.bz2 3489208 RMD160 f20b7d954d7d3b4bda03ebb762868ed378514c8d SHA1 ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 SHA256 34ec9fc871edadf1742057152c0253484d95a534e51a48dbb2e11801e87a0a13
@@ -12,5 +12,5 @@ EBUILD madwifi-ng-0.9.3.2.ebuild 2574 RMD160 d003899f51725f72a4b0ae819816fd557d9
 EBUILD madwifi-ng-0.9.3.3.ebuild 2642 RMD160 bb05de05aa5d55ff56d490ee1af21225b14318b3 SHA1 0ed783f8dd4347ce88b4949642bae0b3e5baeab0 SHA256 63df2b7e715ff7a440dc9b2f4c70cccd1856f129f8a8f86c939ab9c1ea5b9927
 EBUILD madwifi-ng-0.9.4-r1.ebuild 3447 RMD160 12126ad322dc7379835f2b6b29d58e9d997d9ab2 SHA1 5d2e2e90a11032ed580cc8d7a81898ee6f9297eb SHA256 10825a4f262ffeb06459f2ac000241755a9a7ab0b3776be0ebe787b24a4acb19
 EBUILD madwifi-ng-0.9.4.ebuild 3157 RMD160 26e275811b8d0f5a5c4a4da8a77a26e49e28a765 SHA1 949bada8647500c27fceb2d7fb5530351a27ac49 SHA256 587563c6e6212154818c1a0576200bb22abe22453dc52c6a38d0c7a9c37eba2e
-MISC ChangeLog 20452 RMD160 c5d6baf3d975ed4a20eb48bae9cf4e4fe2bf02e7 SHA1 4842b931f72e46fec00fc8c025d0ce3d577bf703 SHA256 07ab6648b7ea50b1aee2e9117226100f27f428b05cd19fc3c2d63b19bc0c82eb
+MISC ChangeLog 20614 RMD160 5fb035fe72470a81452fc64846718e0bb629eae4 SHA1 118857c022c1cd67954540b5839b69ff17af4fcb SHA256 f8ed74c1707572788437f458f746a4620ff25ded933a9dd27809fb07ef2d3307
 MISC metadata.xml 474 RMD160 f4c1656da66f1c8d67b3ba7f5d796c42a28a1ea0 SHA1 0405e39b7aa5373d1e2ee8b47f015f009947738e SHA256 72b875566747e831cbd7faff930a0c3ca7d48d28b5ec0662b36b57e37d91c54f
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch
index 96ae590be7df..b02795f5f76a 100644
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.4-2.6.27-r3811.patch
@@ -1,161 +1,190 @@
-Index: /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c

-===================================================================

---- /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3080)

-+++ /madwifi/branches/madwifi-0.9.4/net80211/ieee80211_wireless.c (revision 3811)

-@@ -1552,4 +1552,5 @@

- struct iwscanreq {		/* XXX: right place for this declaration? */

- 	struct ieee80211vap *vap;

-+	struct iw_request_info *info;

- 	char *current_ev;

- 	char *end_buf;

-@@ -1557,4 +1558,11 @@

- };

- 

-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)

-+#define	iwe_stream_add_event(a, b, c, d, e)	iwe_stream_add_event(b, c, d, e)

-+#define	iwe_stream_add_point(a, b, c, d, e)	iwe_stream_add_point(b, c, d, e)

-+#define	iwe_stream_add_value(a, b, c, d, e, f)	\

-+	iwe_stream_add_value(b, c, d, e, f)

-+#define	iwe_stream_lcp_len(a)			IW_EV_LCP_LEN

-+#endif

- static int

- giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)

-@@ -1591,5 +1599,6 @@

- 	else

- 		IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);

--	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);

-+	current_ev = iwe_stream_add_event(req->info, current_ev, end_buf,

-+					&iwe, IW_EV_ADDR_LEN);

- 

- 	/* We ran out of space in the buffer. */

-@@ -1604,9 +1613,9 @@

- 		iwe.u.data.length = vap->iv_des_nssid > 0 ?

- 			vap->iv_des_ssid[0].len : 0;

--		current_ev = iwe_stream_add_point(current_ev,

-+		current_ev = iwe_stream_add_point(req->info, current_ev,

- 			end_buf, &iwe, vap->iv_des_ssid[0].ssid);

- 	} else {

- 		iwe.u.data.length = se->se_ssid[1];

--		current_ev = iwe_stream_add_point(current_ev,

-+		current_ev = iwe_stream_add_point(req->info, current_ev,

- 			end_buf, &iwe, (char *) se->se_ssid+2);

- 	}

-@@ -1622,6 +1631,6 @@

- 		iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?

- 			IW_MODE_MASTER : IW_MODE_ADHOC;

--		current_ev = iwe_stream_add_event(current_ev,

--			end_buf, &iwe, IW_EV_UINT_LEN);

-+		current_ev = iwe_stream_add_event(req->info, current_ev,

-+				end_buf, &iwe, IW_EV_UINT_LEN);

- 

- 		/* We ran out of space in the buffer. */

-@@ -1635,6 +1644,6 @@

- 	iwe.u.freq.m = se->se_chan->ic_freq * 100000;

- 	iwe.u.freq.e = 1;

--	current_ev = iwe_stream_add_event(current_ev,

--		end_buf, &iwe, IW_EV_FREQ_LEN);

-+	current_ev = iwe_stream_add_event(req->info, current_ev,

-+			end_buf, &iwe, IW_EV_FREQ_LEN);

- 

- 	/* We ran out of space in the buffer. */

-@@ -1646,6 +1655,6 @@

- 	iwe.cmd = IWEVQUAL;

- 	set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE);

--	current_ev = iwe_stream_add_event(current_ev,

--		end_buf, &iwe, IW_EV_QUAL_LEN);

-+	current_ev = iwe_stream_add_event(req->info, current_ev,

-+			end_buf, &iwe, IW_EV_QUAL_LEN);

- 

- 	/* We ran out of space in the buffer */

-@@ -1661,5 +1670,6 @@

- 		iwe.u.data.flags = IW_ENCODE_DISABLED;

- 	iwe.u.data.length = 0;

--	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");

-+	current_ev = iwe_stream_add_point(req->info, current_ev,

-+					end_buf, &iwe, "");

- 

- 	/* We ran out of space in the buffer. */

-@@ -1670,5 +1680,5 @@

- 	last_ev = current_ev;

- 	iwe.cmd = SIOCGIWRATE;

--	current_val = current_ev + IW_EV_LCP_LEN;

-+	current_val = current_ev + iwe_stream_lcp_len(req->info);

- 	/* NB: not sorted, does it matter? */

- 	for (j = 0; j < se->se_rates[1]; j++) {

-@@ -1676,7 +1686,7 @@

- 		if (r != 0) {

- 			iwe.u.bitrate.value = r * (1000000 / 2);

--			current_val = iwe_stream_add_value(current_ev,

--				current_val, end_buf, &iwe,

--				IW_EV_PARAM_LEN);

-+			current_val = iwe_stream_add_value(req->info,

-+					current_ev, current_val, end_buf,

-+					&iwe, IW_EV_PARAM_LEN);

- 		}

- 	}

-@@ -1685,11 +1695,11 @@

- 		if (r != 0) {

- 			iwe.u.bitrate.value = r * (1000000 / 2);

--			current_val = iwe_stream_add_value(current_ev,

--				current_val, end_buf, &iwe,

--				IW_EV_PARAM_LEN);

-+			current_val = iwe_stream_add_value(req->info,

-+					current_ev, current_val, end_buf,

-+					&iwe, IW_EV_PARAM_LEN);

- 		}

- 	}

- 	/* remove fixed header if no rates were added */

--	if ((current_val - current_ev) > IW_EV_LCP_LEN) {

-+	if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) {

- 		current_ev = current_val;

- 	} else {

-@@ -1705,5 +1715,6 @@

- 	snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);

- 	iwe.u.data.length = strlen(buf);

--	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);

-+	current_ev = iwe_stream_add_point(req->info, current_ev,

-+					end_buf, &iwe, buf);

- 

- 	/* We ran out of space in the buffer. */

-@@ -1729,6 +1740,6 @@

- #endif

- 		if (iwe.u.data.length != 0) {

--			current_ev = iwe_stream_add_point(current_ev, end_buf,

--				&iwe, buf);

-+			current_ev = iwe_stream_add_point(req->info,

-+					current_ev, end_buf, &iwe, buf);

- 			

- 			/* We ran out of space in the buffer */

-@@ -1755,6 +1766,6 @@

- #endif

- 		if (iwe.u.data.length != 0) {

--			current_ev = iwe_stream_add_point(current_ev, end_buf,

--				&iwe, buf);

-+			current_ev = iwe_stream_add_point(req->info,

-+					current_ev, end_buf, &iwe, buf);

- 			

- 			/* We ran out of space in the buffer. */

-@@ -1774,6 +1785,6 @@

- 			wme_leader, sizeof(wme_leader) - 1);

- 		if (iwe.u.data.length != 0) {

--			current_ev = iwe_stream_add_point(current_ev, end_buf,

--				&iwe, buf);

-+			current_ev = iwe_stream_add_point(req->info,

-+					current_ev, end_buf, &iwe, buf);

- 

- 			/* We ran out of space in the buffer. */

-@@ -1792,6 +1803,6 @@

- 			ath_leader, sizeof(ath_leader) - 1);

- 		if (iwe.u.data.length != 0) {

--			current_ev = iwe_stream_add_point(current_ev, end_buf,

--				&iwe, buf);

-+			current_ev = iwe_stream_add_point(req->info,

-+					current_ev, end_buf, &iwe, buf);

- 

- 			/* We ran out of space in the buffer. */

-@@ -1816,4 +1827,5 @@

- 

- 	req.vap = vap;

-+	req.info = info;

- 	req.current_ev = extra;

- 	if (data->length == 0) {

+=== modified file 'net80211/ieee80211_wireless.c'
+--- net80211/ieee80211_wireless.c	2008-10-22 18:13:35 +0000
++++ net80211/ieee80211_wireless.c	2008-10-22 18:13:41 +0000
+@@ -1551,11 +1551,19 @@
+ 
+ struct iwscanreq {		/* XXX: right place for this declaration? */
+ 	struct ieee80211vap *vap;
++	struct iw_request_info *info;
+ 	char *current_ev;
+ 	char *end_buf;
+ 	int mode;
+ };
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)
++#define	iwe_stream_add_event(a, b, c, d, e)	iwe_stream_add_event(b, c, d, e)
++#define	iwe_stream_add_point(a, b, c, d, e)	iwe_stream_add_point(b, c, d, e)
++#define	iwe_stream_add_value(a, b, c, d, e, f)	\
++	iwe_stream_add_value(b, c, d, e, f)
++#define	iwe_stream_lcp_len(a)			IW_EV_LCP_LEN
++#endif
+ static int
+ giwscan_cb(void *arg, const struct ieee80211_scan_entry *se)
+ {
+@@ -1590,7 +1598,8 @@
+ 		IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_macaddr);
+ 	else
+ 		IEEE80211_ADDR_COPY(iwe.u.ap_addr.sa_data, se->se_bssid);
+-	current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN);
++	current_ev = iwe_stream_add_event(req->info, current_ev, end_buf,
++					&iwe, IW_EV_ADDR_LEN);
+ 
+ 	/* We ran out of space in the buffer. */
+ 	if (last_ev == current_ev)
+@@ -1603,11 +1612,11 @@
+ 	if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
+ 		iwe.u.data.length = vap->iv_des_nssid > 0 ?
+ 			vap->iv_des_ssid[0].len : 0;
+-		current_ev = iwe_stream_add_point(current_ev,
++		current_ev = iwe_stream_add_point(req->info, current_ev,
+ 			end_buf, &iwe, vap->iv_des_ssid[0].ssid);
+ 	} else {
+ 		iwe.u.data.length = se->se_ssid[1];
+-		current_ev = iwe_stream_add_point(current_ev,
++		current_ev = iwe_stream_add_point(req->info, current_ev,
+ 			end_buf, &iwe, (char *) se->se_ssid+2);
+ 	}
+ 
+@@ -1621,8 +1630,8 @@
+ 		iwe.cmd = SIOCGIWMODE;
+ 		iwe.u.mode = se->se_capinfo & IEEE80211_CAPINFO_ESS ?
+ 			IW_MODE_MASTER : IW_MODE_ADHOC;
+-		current_ev = iwe_stream_add_event(current_ev,
+-			end_buf, &iwe, IW_EV_UINT_LEN);
++		current_ev = iwe_stream_add_event(req->info, current_ev,
++				end_buf, &iwe, IW_EV_UINT_LEN);
+ 
+ 		/* We ran out of space in the buffer. */
+ 		if (last_ev == current_ev)
+@@ -1634,8 +1643,8 @@
+ 	iwe.cmd = SIOCGIWFREQ;
+ 	iwe.u.freq.m = se->se_chan->ic_freq * 100000;
+ 	iwe.u.freq.e = 1;
+-	current_ev = iwe_stream_add_event(current_ev,
+-		end_buf, &iwe, IW_EV_FREQ_LEN);
++	current_ev = iwe_stream_add_event(req->info, current_ev,
++			end_buf, &iwe, IW_EV_FREQ_LEN);
+ 
+ 	/* We ran out of space in the buffer. */
+ 	if (last_ev == current_ev)
+@@ -1645,8 +1654,8 @@
+ 	last_ev = current_ev;
+ 	iwe.cmd = IWEVQUAL;
+ 	set_quality(&iwe.u.qual, se->se_rssi, ATH_DEFAULT_NOISE);
+-	current_ev = iwe_stream_add_event(current_ev,
+-		end_buf, &iwe, IW_EV_QUAL_LEN);
++	current_ev = iwe_stream_add_event(req->info, current_ev,
++			end_buf, &iwe, IW_EV_QUAL_LEN);
+ 
+ 	/* We ran out of space in the buffer */
+ 	if (last_ev == current_ev)
+@@ -1660,7 +1669,8 @@
+ 	else
+ 		iwe.u.data.flags = IW_ENCODE_DISABLED;
+ 	iwe.u.data.length = 0;
+-	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
++	current_ev = iwe_stream_add_point(req->info, current_ev,
++					end_buf, &iwe, "");
+ 
+ 	/* We ran out of space in the buffer. */
+ 	if (last_ev == current_ev)
+@@ -1669,28 +1679,28 @@
+ 	memset(&iwe, 0, sizeof(iwe));
+ 	last_ev = current_ev;
+ 	iwe.cmd = SIOCGIWRATE;
+-	current_val = current_ev + IW_EV_LCP_LEN;
++	current_val = current_ev + iwe_stream_lcp_len(req->info);
+ 	/* NB: not sorted, does it matter? */
+ 	for (j = 0; j < se->se_rates[1]; j++) {
+ 		int r = se->se_rates[2 + j] & IEEE80211_RATE_VAL;
+ 		if (r != 0) {
+ 			iwe.u.bitrate.value = r * (1000000 / 2);
+-			current_val = iwe_stream_add_value(current_ev,
+-				current_val, end_buf, &iwe,
+-				IW_EV_PARAM_LEN);
++			current_val = iwe_stream_add_value(req->info,
++					current_ev, current_val, end_buf,
++					&iwe, IW_EV_PARAM_LEN);
+ 		}
+ 	}
+ 	for (j = 0; j < se->se_xrates[1]; j++) {
+ 		int r = se->se_xrates[2+j] & IEEE80211_RATE_VAL;
+ 		if (r != 0) {
+ 			iwe.u.bitrate.value = r * (1000000 / 2);
+-			current_val = iwe_stream_add_value(current_ev,
+-				current_val, end_buf, &iwe,
+-				IW_EV_PARAM_LEN);
++			current_val = iwe_stream_add_value(req->info,
++					current_ev, current_val, end_buf,
++					&iwe, IW_EV_PARAM_LEN);
+ 		}
+ 	}
+ 	/* remove fixed header if no rates were added */
+-	if ((current_val - current_ev) > IW_EV_LCP_LEN) {
++	if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) {
+ 		current_ev = current_val;
+ 	} else {
+ 	  /* We ran out of space in the buffer. */
+@@ -1704,7 +1714,8 @@
+ 	iwe.cmd = IWEVCUSTOM;
+ 	snprintf(buf, sizeof(buf), "bcn_int=%d", se->se_intval);
+ 	iwe.u.data.length = strlen(buf);
+-	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
++	current_ev = iwe_stream_add_point(req->info, current_ev,
++					end_buf, &iwe, buf);
+ 
+ 	/* We ran out of space in the buffer. */
+ 	if (last_ev == current_ev)
+@@ -1728,8 +1739,8 @@
+ 				rsn_leader, sizeof(rsn_leader) - 1);
+ #endif
+ 		if (iwe.u.data.length != 0) {
+-			current_ev = iwe_stream_add_point(current_ev, end_buf,
+-				&iwe, buf);
++			current_ev = iwe_stream_add_point(req->info,
++					current_ev, end_buf, &iwe, buf);
+ 			
+ 			/* We ran out of space in the buffer */
+ 			if (last_ev == current_ev)
+@@ -1754,8 +1765,8 @@
+ 			wpa_leader, sizeof(wpa_leader) - 1);
+ #endif
+ 		if (iwe.u.data.length != 0) {
+-			current_ev = iwe_stream_add_point(current_ev, end_buf,
+-				&iwe, buf);
++			current_ev = iwe_stream_add_point(req->info,
++					current_ev, end_buf, &iwe, buf);
+ 			
+ 			/* We ran out of space in the buffer. */
+ 			if (last_ev == current_ev)
+@@ -1773,8 +1784,8 @@
+ 			se->se_wme_ie, se->se_wme_ie[1] + 2,
+ 			wme_leader, sizeof(wme_leader) - 1);
+ 		if (iwe.u.data.length != 0) {
+-			current_ev = iwe_stream_add_point(current_ev, end_buf,
+-				&iwe, buf);
++			current_ev = iwe_stream_add_point(req->info,
++					current_ev, end_buf, &iwe, buf);
+ 
+ 			/* We ran out of space in the buffer. */
+ 			if (last_ev == current_ev)
+@@ -1791,8 +1802,8 @@
+ 			se->se_ath_ie, se->se_ath_ie[1] + 2,
+ 			ath_leader, sizeof(ath_leader) - 1);
+ 		if (iwe.u.data.length != 0) {
+-			current_ev = iwe_stream_add_point(current_ev, end_buf,
+-				&iwe, buf);
++			current_ev = iwe_stream_add_point(req->info,
++					current_ev, end_buf, &iwe, buf);
+ 
+ 			/* We ran out of space in the buffer. */
+ 			if (last_ev == current_ev)
+@@ -1815,6 +1826,7 @@
+ 	int res = 0;
+ 
+ 	req.vap = vap;
++	req.info = info;
+ 	req.current_ev = extra;
+ 	if (data->length == 0) {
+ 	  req.end_buf = extra + IW_SCAN_MAX_DATA;
+