remove old vulnerable, fix help text variable

Package-Manager: portage-2.1.3_rc6

16 files changed, 23 insertions, 1103 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 1ce8ee1f0a38..a22d52ecf963 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.39 2007/06/02 18:55:43 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.40 2007/07/07 11:01:13 genstef Exp $
+
+  07 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/madwifi-ng-0.9.2.1-linux-2.6.20.patch,
+  -files/madwifi-ng-0.9.2-allow-cipher-none.diff,
+  -files/madwifi-ng-0.9.2-ath_intr.diff,
+  -files/madwifi-ng-0.9.2-config.h.diff,
+  -files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff,
+  -files/madwifi-association-fix.patch,
+  -files/madwifi-ng-uudecode-gcda-fix.patch, -madwifi-ng-0.9.2.1.ebuild,
+  -madwifi-ng-0.9.3-r2.ebuild, -madwifi-ng-0.9.3-r3.ebuild,
+  madwifi-ng-0.9.3.1.ebuild:
+  remove old vulnerable, fix help text variable
 
   02 Jun 2007; Peter Weller <welp@gentoo.org> madwifi-ng-0.9.3.1.ebuild:
   Stable on amd46 wrt security bug 179532
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 7ac9f3bf8af3..6f2b93d1f261 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -2,30 +2,6 @@ AUX madwifi-2.6.22.patch 2979 RMD160 dc97301f4d0ff7b53bd084ef7ff5c3186b1246e2 SH
 MD5 2048b32697f6ded57ff40036b6668b45 files/madwifi-2.6.22.patch 2979
 RMD160 dc97301f4d0ff7b53bd084ef7ff5c3186b1246e2 files/madwifi-2.6.22.patch 2979
 SHA256 2672fbdb88ca7cfeaf9cf493f9ff0b2db234967c7980edf9779d1d2842efced8 files/madwifi-2.6.22.patch 2979
-AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 SHA1 c4d67684238c51a4632ae9e01caabe9750f705fa SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff
-MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530
-RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530
-SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff files/madwifi-association-fix.patch 2530
-AUX madwifi-ng-0.9.2-allow-cipher-none.diff 614 RMD160 f8b403b928b1aab8d9f2b872bb1645a15f398558 SHA1 f710b51f751830e8c79916a4da96c99b519b86a9 SHA256 ba2b44da10dba227e322d08d4158cb70034752b278589fa4f4cc68802360ebe8
-MD5 b947a80849881d72353cc51378582634 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
-RMD160 f8b403b928b1aab8d9f2b872bb1645a15f398558 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
-SHA256 ba2b44da10dba227e322d08d4158cb70034752b278589fa4f4cc68802360ebe8 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
-AUX madwifi-ng-0.9.2-ath_intr.diff 1020 RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 SHA1 b154f9d9c1a2e0f9e57d8d60a8c624b86b4716a3 SHA256 3f87b4bf731c1b9e22b8e6ec5b9d630235e76c6b0f89d6511a05d513df75fc0e
-MD5 a450776510e9dfb027100a9477aea1e1 files/madwifi-ng-0.9.2-ath_intr.diff 1020
-RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 files/madwifi-ng-0.9.2-ath_intr.diff 1020
-SHA256 3f87b4bf731c1b9e22b8e6ec5b9d630235e76c6b0f89d6511a05d513df75fc0e files/madwifi-ng-0.9.2-ath_intr.diff 1020
-AUX madwifi-ng-0.9.2-config.h.diff 11817 RMD160 dc6691e89bb4e5010e5e09563614fb5321980c79 SHA1 c38c1326119be212ac1c1c88839a32a36b65b35d SHA256 45c76499437553fab487ecb8b19f86b5177107c5ec441317d774d60f54879746
-MD5 9bd7989a6c7f25ed9bae201b4e721ecf files/madwifi-ng-0.9.2-config.h.diff 11817
-RMD160 dc6691e89bb4e5010e5e09563614fb5321980c79 files/madwifi-ng-0.9.2-config.h.diff 11817
-SHA256 45c76499437553fab487ecb8b19f86b5177107c5ec441317d774d60f54879746 files/madwifi-ng-0.9.2-config.h.diff 11817
-AUX madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e3817612880e86342c699f297680d3 SHA1 eccde455495548d7650163b2eba9950b442bd441 SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35
-MD5 7ec7bc646805244f713c1afdb698f211 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
-RMD160 96450d5320e3817612880e86342c699f297680d3 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
-SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
-AUX madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240 RMD160 dafc042865d7cc5e487d5ecf5c6bd1428fd2f866 SHA1 c47e0415a26fab5e88862c044a1f601b64d3475a SHA256 d5eea77279187314011c536d644a948f91047bbd0ea0ef3849bbd64122e57a32
-MD5 d87e52249fc7224d08dc51adc10f6f75 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240
-RMD160 dafc042865d7cc5e487d5ecf5c6bd1428fd2f866 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240
-SHA256 d5eea77279187314011c536d644a948f91047bbd0ea0ef3849bbd64122e57a32 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240
 AUX madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea SHA1 3c84bf4e203ab3c810c734816dd1291ba19b0005 SHA256 be6e7a66acad56044c25ab56d9cbd7d5326c4ba21f5d9ed25caef56a9577bdc8
 MD5 c2c1ef3c395377312cfa0e012ded2777 files/madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340
 RMD160 2a18fc4f9e66aa131e901e7e46930e08e2ece7ea files/madwifi-ng-0.9.3-uudecode-gcda-fix.patch 340
@@ -34,46 +10,19 @@ AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b S
 MD5 e72b6534fc8941fd6c890f2ecbf470e6 files/madwifi-ng-r1886.patch 965
 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b files/madwifi-ng-r1886.patch 965
 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe files/madwifi-ng-r1886.patch 965
-AUX madwifi-ng-uudecode-gcda-fix.patch 328 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e SHA1 553ce53acb0ae781a83715951857414a36d25e80 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d
-MD5 a0e4e3918e720015a4416efc14431c47 files/madwifi-ng-uudecode-gcda-fix.patch 328
-RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-fix.patch 328
-SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d files/madwifi-ng-uudecode-gcda-fix.patch 328
-DIST madwifi-0.9.2.1.tar.bz2 3476892 RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e SHA1 6606291b6facc299203158bfaa1bde09219459db SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843
 DIST madwifi-0.9.3.1.tar.bz2 3488269 RMD160 5daad5c17d42ee0b5618d46213293c4d6289130b SHA1 96647476b70ec80c83a13e3d381776416f6ccbff SHA256 623aa90dd9da9c0140ae71d205c6e8cb32f8a555f0f12d873494df05a07945ec
-DIST madwifi-0.9.3.tar.bz2 3488332 RMD160 52eb553669ab83a9c594afd4eb1e297bea07089c SHA1 3f8a78264491dcb4bc98d40f971af546e86f8710 SHA256 847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8
-EBUILD madwifi-ng-0.9.2.1.ebuild 4292 RMD160 9c2f2d8661ba28d72d7b1d251380ace7a70ca45a SHA1 a4daa4ca2341cf758ef2ec107e2f07f28ba66a91 SHA256 c4c97df7bcea36d108baba660a13b83f0ee36779371675d9aa0fdafaf0ec8d6c
-MD5 9ee2bb28973ce555eefce8adae20923a madwifi-ng-0.9.2.1.ebuild 4292
-RMD160 9c2f2d8661ba28d72d7b1d251380ace7a70ca45a madwifi-ng-0.9.2.1.ebuild 4292
-SHA256 c4c97df7bcea36d108baba660a13b83f0ee36779371675d9aa0fdafaf0ec8d6c madwifi-ng-0.9.2.1.ebuild 4292
-EBUILD madwifi-ng-0.9.3-r2.ebuild 2771 RMD160 cf350ff3a98dc9651b8e19b49f2aa3f37caff25a SHA1 ac6f114807eab1b3292b08eac437353e96b072cb SHA256 c3d0fc8c880bfc2a2d30481ca43448ada8bd0d82d526241cade5ecc8f9353f6b
-MD5 52d9b4b6c091c21ddfa7b1c7adbbf81a madwifi-ng-0.9.3-r2.ebuild 2771
-RMD160 cf350ff3a98dc9651b8e19b49f2aa3f37caff25a madwifi-ng-0.9.3-r2.ebuild 2771
-SHA256 c3d0fc8c880bfc2a2d30481ca43448ada8bd0d82d526241cade5ecc8f9353f6b madwifi-ng-0.9.3-r2.ebuild 2771
-EBUILD madwifi-ng-0.9.3-r3.ebuild 2948 RMD160 551006644ad9d3f79e107187a4d2afd99e5cfba7 SHA1 9dbd531c98bece2e5c14f970d1cf2121dab84e2e SHA256 be14208e24c29e73ca7071d3fa73d37ee0a5d6080ee1e072c56df13c8afe99e7
-MD5 1581646d46eb1830fb3786147a07739f madwifi-ng-0.9.3-r3.ebuild 2948
-RMD160 551006644ad9d3f79e107187a4d2afd99e5cfba7 madwifi-ng-0.9.3-r3.ebuild 2948
-SHA256 be14208e24c29e73ca7071d3fa73d37ee0a5d6080ee1e072c56df13c8afe99e7 madwifi-ng-0.9.3-r3.ebuild 2948
-EBUILD madwifi-ng-0.9.3.1.ebuild 2603 RMD160 5b82e76542e3d500cb0a6acb716682bc9757f182 SHA1 ed2368bc4729d9315214b5ac07609c22b589f87c SHA256 840ee6a4fb9f45ab89413dada283fb89b9f63329940eb5d07bc0ca22de6dfc97
-MD5 b07fdf0de11893f8b043199a72fa93f2 madwifi-ng-0.9.3.1.ebuild 2603
-RMD160 5b82e76542e3d500cb0a6acb716682bc9757f182 madwifi-ng-0.9.3.1.ebuild 2603
-SHA256 840ee6a4fb9f45ab89413dada283fb89b9f63329940eb5d07bc0ca22de6dfc97 madwifi-ng-0.9.3.1.ebuild 2603
-MISC ChangeLog 16497 RMD160 8007c2079ebb5faa61b328d18396e693a8f107de SHA1 4f8e71c06d003b789a522f70a5ae34e74ad6baf4 SHA256 4ac0db489c6a0402e93f7f186d87b308b37b8ec7ee08cd8205ec8539c18c21c4
-MD5 66376d126d9ad57a3c916c51fdeb8786 ChangeLog 16497
-RMD160 8007c2079ebb5faa61b328d18396e693a8f107de ChangeLog 16497
-SHA256 4ac0db489c6a0402e93f7f186d87b308b37b8ec7ee08cd8205ec8539c18c21c4 ChangeLog 16497
+EBUILD madwifi-ng-0.9.3.1.ebuild 2609 RMD160 0360c43b922ce8512d7859c3cadae4cba0f01443 SHA1 a7f38f64e12ec47668632b25522e1dca4a47978b SHA256 ddc5312dce1ca282066ac1a02944638faef1dc20a6acce15076f355eccf36bc3
+MD5 d53a62756391ab02b659da9f953014c8 madwifi-ng-0.9.3.1.ebuild 2609
+RMD160 0360c43b922ce8512d7859c3cadae4cba0f01443 madwifi-ng-0.9.3.1.ebuild 2609
+SHA256 ddc5312dce1ca282066ac1a02944638faef1dc20a6acce15076f355eccf36bc3 madwifi-ng-0.9.3.1.ebuild 2609
+MISC ChangeLog 17042 RMD160 d2feddc545af972db19fe5f8b8b56554c232bd7e SHA1 dbf542077eaf1d64aa44b2966990911883b79fde SHA256 d5e1a1ae583625f652d4a5633ad287adc69601c156f0642cc4942d4b49a519fc
+MD5 821c023d8d500af60a6d4bd8ccbc3499 ChangeLog 17042
+RMD160 d2feddc545af972db19fe5f8b8b56554c232bd7e ChangeLog 17042
+SHA256 d5e1a1ae583625f652d4a5633ad287adc69601c156f0642cc4942d4b49a519fc ChangeLog 17042
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 metadata.xml 256
-MD5 4759e10919b6002661f86f34d4d1bc7b files/digest-madwifi-ng-0.9.2.1 253
-RMD160 2e13cbbae0eb8588a73d66fd4760e0c2dcd3f077 files/digest-madwifi-ng-0.9.2.1 253
-SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/digest-madwifi-ng-0.9.2.1 253
-MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3-r2 247
-RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3-r2 247
-SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3-r2 247
-MD5 08d87d4cb379b29c4e24063b03dc75a3 files/digest-madwifi-ng-0.9.3-r3 247
-RMD160 a3b16a034a59b6f8208c0e1e29653d0756de0b8a files/digest-madwifi-ng-0.9.3-r3 247
-SHA256 c35fa1fbdf62a5dc311f54e25a329e6fe220b00e6858f8e5335149056ab97bf0 files/digest-madwifi-ng-0.9.3-r3 247
 MD5 d413a077d47b9874de23367d17a158e2 files/digest-madwifi-ng-0.9.3.1 253
 RMD160 0c6c7f73fe2613e19e8db84944aeeb5b3ba7c941 files/digest-madwifi-ng-0.9.3.1 253
 SHA256 f70919ac601379f4b2f6c4047a9f0cda4ac2d895e03417babd79753827626057 files/digest-madwifi-ng-0.9.3.1 253
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1
deleted file mode 100644
index acf9974b479a..000000000000
--- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf5509fccd3852e22551826063b1b61e madwifi-0.9.2.1.tar.bz2 3476892
-RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e madwifi-0.9.2.1.tar.bz2 3476892
-SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843 madwifi-0.9.2.1.tar.bz2 3476892
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r2 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r2
deleted file mode 100644
index c898ea732b56..000000000000
--- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26c31e8e1528fd098e3aaa11c0d34d99 madwifi-0.9.3.tar.bz2 3488332
-RMD160 52eb553669ab83a9c594afd4eb1e297bea07089c madwifi-0.9.3.tar.bz2 3488332
-SHA256 847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8 madwifi-0.9.3.tar.bz2 3488332
diff --git a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3 b/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3
deleted file mode 100644
index c898ea732b56..000000000000
--- a/net-wireless/madwifi-ng/files/digest-madwifi-ng-0.9.3-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26c31e8e1528fd098e3aaa11c0d34d99 madwifi-0.9.3.tar.bz2 3488332
-RMD160 52eb553669ab83a9c594afd4eb1e297bea07089c madwifi-0.9.3.tar.bz2 3488332
-SHA256 847596646417abbdce9cfd0e1dca2cced29c6a8b814d1bd28d0c7301e9e4e9d8 madwifi-0.9.3.tar.bz2 3488332
diff --git a/net-wireless/madwifi-ng/files/madwifi-association-fix.patch b/net-wireless/madwifi-ng/files/madwifi-association-fix.patch
deleted file mode 100644
index 41b6b4043e18..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-association-fix.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: net80211/ieee80211_wireless.c
-===================================================================
---- net80211/ieee80211_wireless.c	(revision 1704)
-+++ net80211/ieee80211_wireless.c	(working copy)
-@@ -120,39 +120,6 @@
- 	iq->level = iq->noise + iq->qual;
- 	iq->updated = IW_QUAL_ALL_UPDATED;
- }
--
--static void
--preempt_scan(struct net_device *dev, int max_grace, int max_wait)
--{
--	struct ieee80211vap *vap = dev->priv;
--	struct ieee80211com *ic = vap->iv_ic;
--	int total_delay = 0;
--	int cancelled = 0, ready = 0;
--	while (!ready && total_delay < max_grace + max_wait) {
--	  if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
--	    ready = 1;
--	  } else {
--	    if (!cancelled && total_delay > max_grace) {
--	      /* 
--		 Cancel any existing active scan, so that any new parameters
--		 in this scan ioctl (or the defaults) can be honored, then
--		 wait around a while to see if the scan cancels properly.
--	      */
--	      IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
--				"%s: cancel pending scan request\n", __func__);
--	      (void) ieee80211_cancel_scan(vap);
--	      cancelled = 1;
--	    }
--	    mdelay (1);
--	    total_delay += 1;
--	  }
--	}
--	if (!ready) {
--	  IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, 
--			    "%s: Timeout cancelling current scan.\n", 
--			    __func__); 
--	}
--}
- 	
- static struct iw_statistics *
- ieee80211_iw_getstats(struct net_device *dev)
-@@ -1515,34 +1482,6 @@
- 	/* XXX always manual... */
- 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
- 		"%s: active scan request\n", __func__);
--	preempt_scan(dev, 100, 100);
--#if WIRELESS_EXT > 17
--	if (data && (data->flags & IW_SCAN_THIS_ESSID)) {
--		struct iw_scan_req req;
--		struct ieee80211_scan_ssid ssid;
--		int copyLength;
--		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
--			"%s: SCAN_THIS_ESSID requested\n", __func__);
--		if (data->length > sizeof req) {
--			copyLength = sizeof req;
--		} else {
--			copyLength = data->length;
--		}
--		memset(&req, 0, sizeof req);
--		if (copy_from_user(&req, data->pointer, copyLength))
--			return -EFAULT;
--		memcpy(&ssid.ssid, req.essid, sizeof ssid.ssid);
--		ssid.len = req.essid_len;
--		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
--				  "%s: requesting scan of essid '%s'\n", __func__, ssid.ssid);
--		(void) ieee80211_start_scan(vap,
--			IEEE80211_SCAN_ACTIVE |
--			IEEE80211_SCAN_NOPICK |
--			IEEE80211_SCAN_ONCE, IEEE80211_SCAN_FOREVER,
--			1, &ssid);
--		return 0;
--	}
--#endif		 
- 	(void) ieee80211_start_scan(vap, IEEE80211_SCAN_ACTIVE |
- 		IEEE80211_SCAN_NOPICK |	IEEE80211_SCAN_ONCE,
- 		IEEE80211_SCAN_FOREVER,
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff
deleted file mode 100644
index ed4af2bc1138..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-*** net80211/ieee80211_wireless.c.orig	Sat Jan 13 07:14:39 2007
---- net80211/ieee80211_wireless.c	Sat Jan 13 07:15:19 2007
-***************
-*** 2079,2085 ****
-  			retv = ENETRESET;
-  		break;
-  	case IEEE80211_PARAM_UCASTCIPHER:
-! 		if ((rsn->rsn_ucastcipherset & cipher2cap(value)) == 0)
-  			return -EINVAL;
-  		rsn->rsn_ucastcipher = value;
-  		break;
---- 2079,2086 ----
-  			retv = ENETRESET;
-  		break;
-  	case IEEE80211_PARAM_UCASTCIPHER:
-! 		if ((value != IEEE80211_CIPHER_NONE)
-! 			&& ((rsn->rsn_ucastcipherset & cipher2cap(value)) == 0))
-  			return -EINVAL;
-  		rsn->rsn_ucastcipher = value;
-  		break;
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff
deleted file mode 100644
index 6dc16f3e62ff..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: trunk/ath/if_ath.c
-===================================================================
---- trunk/ath/if_ath.c (revision 1751)
-+++ trunk/ath/if_ath.c (revision 1752)
-@@ -1600,5 +1600,9 @@
-  */
- irqreturn_t
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+ath_intr(int irq, void *dev_id)
-+#else
- ath_intr(int irq, void *dev_id, struct pt_regs *regs)
-+#endif
- {
- 	struct net_device *dev = dev_id;
-Index: trunk/ath/if_athvar.h
-===================================================================
---- trunk/ath/if_athvar.h (revision 1726)
-+++ trunk/ath/if_athvar.h (revision 1752)
-@@ -727,5 +727,9 @@
- void ath_suspend(struct net_device *);
- void ath_shutdown(struct net_device *);
--irqreturn_t ath_intr(int, void *, struct pt_regs *);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+irqreturn_t ath_intr(int, void *);
-+#else
-+irqreturn_t ath_intr(int, void *, struct pt_regs *regs);
-+#endif
- int ath_ioctl_ethtool(struct ath_softc *, int, void __user *);
- void bus_read_cachesize(struct ath_softc *, u_int8_t *);
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff
deleted file mode 100644
index a78a57186ad5..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff
+++ /dev/null
@@ -1,372 +0,0 @@
-Index: trunk/ath/if_ath.c
-===================================================================
---- trunk/ath/if_ath.c (revision 1720)
-+++ trunk/ath/if_ath.c (revision 1721)
-@@ -45,5 +45,7 @@
- #include "opt_ah.h"
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/ath/if_ath_ahb.c
-===================================================================
---- trunk/ath/if_ath_ahb.c (revision 1714)
-+++ trunk/ath/if_ath_ahb.c (revision 1721)
-@@ -11,5 +11,7 @@
- #endif
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/ath/if_ath_pci.c
-===================================================================
---- trunk/ath/if_ath_pci.c (revision 1714)
-+++ trunk/ath/if_ath_pci.c (revision 1721)
-@@ -43,5 +43,7 @@
- #endif
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/ath_rate/amrr/amrr.c
-===================================================================
---- trunk/ath_rate/amrr/amrr.c (revision 1667)
-+++ trunk/ath_rate/amrr/amrr.c (revision 1721)
-@@ -44,5 +44,7 @@
-  *    Mathieu Lacage, Hossein Manshaei, Thierry Turletti
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/ath_rate/onoe/onoe.c
-===================================================================
---- trunk/ath_rate/onoe/onoe.c (revision 1667)
-+++ trunk/ath_rate/onoe/onoe.c (revision 1721)
-@@ -40,5 +40,7 @@
-  * Atsushi Onoe's rate control algorithm.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/ath_rate/sample/sample.c
-===================================================================
---- trunk/ath_rate/sample/sample.c (revision 1667)
-+++ trunk/ath_rate/sample/sample.c (revision 1721)
-@@ -42,5 +42,7 @@
-  */
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/hal/linux/ah_osdep.c
-===================================================================
---- trunk/hal/linux/ah_osdep.c (revision 1711)
-+++ trunk/hal/linux/ah_osdep.c (revision 1721)
-@@ -42,5 +42,7 @@
- #endif
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211.c
-===================================================================
---- trunk/net80211/ieee80211.c (revision 1666)
-+++ trunk/net80211/ieee80211.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 generic handler
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_acl.c
-===================================================================
---- trunk/net80211/ieee80211_acl.c (revision 1614)
-+++ trunk/net80211/ieee80211_acl.c (revision 1721)
-@@ -46,5 +46,7 @@
-  * or rejected (ACL_POLICY_DENT).
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_beacon.c
-===================================================================
---- trunk/net80211/ieee80211_beacon.c (revision 1575)
-+++ trunk/net80211/ieee80211_beacon.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 beacon handling routines
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_crypto.c
-===================================================================
---- trunk/net80211/ieee80211_crypto.c (revision 1426)
-+++ trunk/net80211/ieee80211_crypto.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 generic crypto support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- trunk/net80211/ieee80211_crypto_ccmp.c (revision 1643)
-+++ trunk/net80211/ieee80211_crypto_ccmp.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * it's license is included below.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_crypto_none.c
-===================================================================
---- trunk/net80211/ieee80211_crypto_none.c (revision 1426)
-+++ trunk/net80211/ieee80211_crypto_none.c (revision 1721)
-@@ -35,5 +35,7 @@
-  * IEEE 802.11 NULL crypto support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_crypto_tkip.c
-===================================================================
---- trunk/net80211/ieee80211_crypto_tkip.c (revision 1426)
-+++ trunk/net80211/ieee80211_crypto_tkip.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * it's license is included below.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_crypto_wep.c
-===================================================================
---- trunk/net80211/ieee80211_crypto_wep.c (revision 1443)
-+++ trunk/net80211/ieee80211_crypto_wep.c (revision 1721)
-@@ -35,5 +35,7 @@
-  * IEEE 802.11 WEP crypto support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_input.c
-===================================================================
---- trunk/net80211/ieee80211_input.c (revision 1713)
-+++ trunk/net80211/ieee80211_input.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 input handling.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_linux.c
-===================================================================
---- trunk/net80211/ieee80211_linux.c (revision 1690)
-+++ trunk/net80211/ieee80211_linux.c (revision 1721)
-@@ -34,5 +34,7 @@
-  * IEEE 802.11 support (Linux-specific code)
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_monitor.c
-===================================================================
---- trunk/net80211/ieee80211_monitor.c (revision 1720)
-+++ trunk/net80211/ieee80211_monitor.c (revision 1721)
-@@ -35,5 +35,7 @@
-  * IEEE 802.11 monitor mode 
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_node.c
-===================================================================
---- trunk/net80211/ieee80211_node.c (revision 1640)
-+++ trunk/net80211/ieee80211_node.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 node handling support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_output.c
-===================================================================
---- trunk/net80211/ieee80211_output.c (revision 1637)
-+++ trunk/net80211/ieee80211_output.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 output handling.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_power.c
-===================================================================
---- trunk/net80211/ieee80211_power.c (revision 1637)
-+++ trunk/net80211/ieee80211_power.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 power save support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_proto.c
-===================================================================
---- trunk/net80211/ieee80211_proto.c (revision 1699)
-+++ trunk/net80211/ieee80211_proto.c (revision 1721)
-@@ -39,5 +39,7 @@
-  * IEEE 802.11 protocol support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/kmod.h>
-Index: trunk/net80211/ieee80211_scan.c
-===================================================================
---- trunk/net80211/ieee80211_scan.c (revision 1698)
-+++ trunk/net80211/ieee80211_scan.c (revision 1721)
-@@ -38,5 +38,7 @@
-  * IEEE 802.11 scanning support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_scan_ap.c
-===================================================================
---- trunk/net80211/ieee80211_scan_ap.c (revision 1698)
-+++ trunk/net80211/ieee80211_scan_ap.c (revision 1721)
-@@ -38,5 +38,7 @@
-  * IEEE 802.11 ap scanning support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_scan_sta.c
-===================================================================
---- trunk/net80211/ieee80211_scan_sta.c (revision 1698)
-+++ trunk/net80211/ieee80211_scan_sta.c (revision 1721)
-@@ -38,5 +38,7 @@
-  * IEEE 802.11 station scanning support.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/ieee80211_wireless.c
-===================================================================
---- trunk/net80211/ieee80211_wireless.c (revision 1717)
-+++ trunk/net80211/ieee80211_wireless.c (revision 1721)
-@@ -40,5 +40,7 @@
-  * Wireless extensions support for 802.11 common code.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- 
- #ifdef CONFIG_NET_WIRELESS
-Index: trunk/net80211/ieee80211_xauth.c
-===================================================================
---- trunk/net80211/ieee80211_xauth.c (revision 1426)
-+++ trunk/net80211/ieee80211_xauth.c (revision 1721)
-@@ -47,5 +47,7 @@
-  * entirely from messages about stations joining and leaving.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/net80211/if_media.c
-===================================================================
---- trunk/net80211/if_media.c (revision 1614)
-+++ trunk/net80211/if_media.c (revision 1721)
-@@ -50,5 +50,7 @@
- #endif
- 
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/regression/ccmp/test_ccmp.c
-===================================================================
---- trunk/regression/ccmp/test_ccmp.c (revision 1426)
-+++ trunk/regression/ccmp/test_ccmp.c (revision 1721)
-@@ -45,5 +45,7 @@
-  * 1, 2, and 3.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/regression/tkip/test_tkip.c
-===================================================================
---- trunk/regression/tkip/test_tkip.c (revision 1426)
-+++ trunk/regression/tkip/test_tkip.c (revision 1721)
-@@ -35,5 +35,7 @@
-  * TKIP test module.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
-Index: trunk/regression/wep/test_wep.c
-===================================================================
---- trunk/regression/wep/test_wep.c (revision 1426)
-+++ trunk/regression/wep/test_wep.c (revision 1721)
-@@ -45,5 +45,7 @@
-  * 1, 2, and 3.
-  */
-+#ifndef AUTOCONF_INCLUDED
- #include <linux/config.h>
-+#endif
- #include <linux/version.h>
- #include <linux/module.h>
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff
deleted file mode 100644
index dd660c81a6cd..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: trunk/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- trunk/net80211/ieee80211_crypto_ccmp.c (revision 1732)
-+++ trunk/net80211/ieee80211_crypto_ccmp.c (revision 1745)
-@@ -300,4 +300,8 @@
- rijndael_encrypt(struct crypto_tfm *tfm, const void *src, void *dst)
- {
-+/* FIXME: check for Linux 2.6.19 or newer once it's released */
-+#ifdef CRYPTO_ALG_ASYNC
-+	crypto_cipher_encrypt_one(tfm, dst, src);
-+#else
- 	struct scatterlist sg_src;
- 	struct scatterlist sg_dst;
-@@ -311,4 +315,5 @@
- 	sg_dst.length = AES_BLOCK_LEN;
- 	crypto_cipher_encrypt(tfm, &sg_dst, &sg_src, AES_BLOCK_LEN);
-+#endif
- }
- 
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch
deleted file mode 100644
index aa7d28627cc1..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Index: madwifi-0.9.2.1/ath_hal/ah_osdep.h
-===================================================================
---- madwifi-0.9.2.1.orig/hal/linux/ah_osdep.h
-+++ madwifi-0.9.2.1/hal/linux/ah_osdep.h
-@@ -40,12 +40,12 @@
- 
- /*
-- * Starting with 2.6.4 the kernel supports a configuration option
-- * to pass parameters in registers.  If this is enabled we must
-- * mark all function interfaces in+out of the HAL to pass parameters
-- * on the stack as this is the convention used internally (for
-- * maximum portability).
-+ * Linux on i386 may pass parameters in registers.  This is an option
-+ * starting with Linux 2.6.4.  Starting with Linux 2.6.20, it's done
-+ * unconditionally.  However, the HAL uses standard ABI whereas the
-+ * parameters are passed on the stack (for maximum portability).
-+ * "asmlinkage" forces the standard ABI for the HAL calls.
-  */
--#ifdef CONFIG_REGPARM
--#define	__ahdecl	__attribute__((regparm(0)))
-+#ifdef __i386__
-+#define	__ahdecl	asmlinkage
- #else
- #define	__ahdecl
-Index: madwifi-0.9.2.1/ath/if_ath.c
-===================================================================
---- madwifi-0.9.2.1.orig/ath/if_ath.c
-+++ madwifi-0.9.2.1/ath/if_ath.c
-@@ -118,7 +118,7 @@ static void ath_fatal_tasklet(TQUEUE_ARG
- static void ath_rxorn_tasklet(TQUEUE_ARG);
- static void ath_bmiss_tasklet(TQUEUE_ARG);
- static void ath_bstuck_tasklet(TQUEUE_ARG);
--static void ath_radar_task(TQUEUE_ARG);
-+static void ath_radar_task(struct work_struct *);
- static void ath_dfs_test_return(unsigned long);
- 
- static int ath_stop_locked(struct net_device *);
-@@ -414,7 +414,7 @@ ath_attach(u_int16_t devid, struct net_d
- 	ATH_INIT_TQUEUE(&sc->sc_bstucktq,ath_bstuck_tasklet,	dev);
- 	ATH_INIT_TQUEUE(&sc->sc_rxorntq, ath_rxorn_tasklet,	dev);
- 	ATH_INIT_TQUEUE(&sc->sc_fataltq, ath_fatal_tasklet,	dev);
--	ATH_INIT_SCHED_TASK(&sc->sc_radartask, ath_radar_task,	dev);
-+	ATH_INIT_WORK(&sc->sc_radartask, ath_radar_task);
- 
- 	/*
- 	 * Attach the hal and verify ABI compatibility by checking
-@@ -934,7 +934,7 @@ ath_detach(struct net_device *dev)
- 	ath_hal_setpower(sc->sc_ah, HAL_PM_AWAKE);
- 	/* Flush the radar task if it's scheduled */
- 	if (sc->sc_rtasksched == 1)
--		ATH_FLUSH_TASKS();
-+		flush_scheduled_work();
- 
- 	sc->sc_invalid = 1;
- 
-@@ -1707,10 +1707,9 @@ ath_intr(int irq, void *dev_id, struct p
- }
- 
- static void
--ath_radar_task(TQUEUE_ARG data)
-+ath_radar_task(struct work_struct *thr)
- {
--	struct net_device *dev = (struct net_device *)data;
--	struct ath_softc *sc = dev->priv;
-+	struct ath_softc *sc = container_of(thr, struct ath_softc, sc_radartask);
- 	struct ath_hal *ah = sc->sc_ah;
- 	struct ieee80211com *ic = &sc->sc_ic;
- 	struct ieee80211_channel ichan;
-@@ -5634,7 +5633,7 @@ rx_next:
- 	ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan);
- 	if (ath_hal_radar_event(ah)) {
- 		sc->sc_rtasksched = 1;
--		ATH_SCHEDULE_TASK(&sc->sc_radartask);
-+		schedule_work(&sc->sc_radartask);
- 	}
- #undef PA2DESC
- }
-Index: madwifi-0.9.2.1/ath/if_athvar.h
-===================================================================
---- madwifi-0.9.2.1.orig/ath/if_athvar.h
-+++ madwifi-0.9.2.1/ath/if_athvar.h
-@@ -71,22 +71,22 @@ typedef void *TQUEUE_ARG;
- #include <linux/sched.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
- #include <linux/tqueue.h>
--#define ATH_WORK_THREAD			tq_struct
--#define ATH_SCHEDULE_TASK(t)		schedule_task((t))
--#define ATH_INIT_SCHED_TASK(t, f, d) do { 	\
-+#define work_struct			tq_struct
-+#define schedule_work(t)		schedule_task((t))
-+#define flush_scheduled_work()		flush_scheduled_tasks()
-+#define ATH_INIT_WORK(t, f) do { 	\
- 	memset((t),0,sizeof(struct tq_struct)); 	\
- 	(t)->routine = (void (*)(void*)) (f); 	\
--	(t)->data=(void *) (d); 		\
-+	(t)->data=(void *) (t); 		\
- } while (0)
--#define ATH_FLUSH_TASKS			flush_scheduled_tasks
- #else
- #include <linux/workqueue.h>
--#define ATH_SCHEDULE_TASK(t)		schedule_work((t))
- 
--#define ATH_INIT_SCHED_TASK(_t, _f, _d)	INIT_WORK((_t), (void (*)(void *))(_f), (void *)(_d));
--
--#define ATH_WORK_THREAD			work_struct
--#define	ATH_FLUSH_TASKS			flush_scheduled_work
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-+#define ATH_INIT_WORK(_t, _f)	INIT_WORK((_t), (void (*)(void *))(_f), (void *)(_t));
-+#else
-+#define ATH_INIT_WORK(_t, _f)	INIT_WORK((_t), (_f));
-+#endif
- #endif /* KERNEL_VERSION < 2.5.41 */
- 
- /*
-@@ -613,7 +613,7 @@ struct ath_softc {
- 
- 	struct timer_list sc_cal_ch;		/* calibration timer */
- 	HAL_NODE_STATS sc_halstats;		/* station-mode rssi stats */
--	struct ATH_WORK_THREAD sc_radartask;	/* Schedule task for DFS handling */
-+	struct work_struct sc_radartask;	/* Schedule task for DFS handling */
- 
- #ifdef CONFIG_SYSCTL
- 	struct ctl_table_header *sc_sysctl_header;
-Index: madwifi-0.9.2.1/hal/linux/ah_osdep.c
-===================================================================
---- madwifi-0.9.2.1.orig/hal/linux/ah_osdep.c
-+++ madwifi-0.9.2.1/hal/linux/ah_osdep.c
-@@ -51,6 +51,7 @@
- #include <linux/kernel.h>
- #include <linux/slab.h>
- #include <linux/delay.h>
-+#include <linux/jiffies.h>
- 
- #include <linux/sysctl.h>
- #include <linux/proc_fs.h>
-Index: madwifi-0.9.2.1/net80211/ieee80211_linux.h
-===================================================================
---- madwifi-0.9.2.1.orig/net80211/ieee80211_linux.h
-+++ madwifi-0.9.2.1/net80211/ieee80211_linux.h
-@@ -276,9 +276,15 @@ struct ieee80211_cb {
-  * mbuf packet header to store this data.
-  * XXX use private cb area
-  */
--#define	M_AGE_SET(skb,v)	(skb->csum = v)
--#define	M_AGE_GET(skb)		(skb->csum)
--#define	M_AGE_SUB(skb,adj)	(skb->csum -= adj)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-+#define skb_age csum_offset
-+#else
-+#define skb_age csum
-+#endif
-+
-+#define	M_AGE_SET(skb,v)	(skb->skb_age = v)
-+#define	M_AGE_GET(skb)		(skb->skb_age)
-+#define	M_AGE_SUB(skb,adj)	(skb->skb_age -= adj)
- 
- struct ieee80211com;
- struct ieee80211vap;
-@@ -415,6 +421,8 @@ static __inline unsigned long msecs_to_j
- 
- #endif
- 
-+#include <linux/jiffies.h>
-+
- #ifndef CLONE_KERNEL
- /*
-  * List of flags we want to share for kernel threads,
-@@ -423,6 +431,7 @@ static __inline unsigned long msecs_to_j
- #define CLONE_KERNEL	(CLONE_FS | CLONE_FILES | CLONE_SIGHAND)
- #endif
- 
-+#include <linux/mm.h>
- #ifndef offset_in_page
- #define	offset_in_page(p) ((unsigned long) (p) & ~PAGE_MASK)
- #endif
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch b/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch
deleted file mode 100644
index 06a3f1bbf1a8..000000000000
--- a/net-wireless/madwifi-ng/files/madwifi-ng-uudecode-gcda-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ath/Makefile
-===================================================================
---- ath/Makefile	(revision 1648)
-+++ ath/Makefile	(working copy)
-@@ -61,6 +61,7 @@
- ath_hal-objs	:= ah_osdep.o ${TARGET}.hal.o
- 
- hostprogs-y	:= uudecode
-+uudecode-objs	:= uudecode.o
- 
- # For older 2.6 kernels
- host-progs	:= $(hostprogs-y)
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
deleted file mode 100644
index d556af61bc28..000000000000
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.8 2007/02/20 12:12:40 genstef Exp $
-
-inherit linux-mod
-
-MY_P=${PN/-ng/}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
-HOMEPAGE="http://www.madwifi.org/"
-SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
-
-LICENSE="atheros-hal
-	|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="amrr injection onoe"
-DEPEND="app-arch/sharutils"
-RDEPEND="!net-wireless/madwifi-old
-		~net-wireless/madwifi-ng-tools-${PV:0:5}"
-
-CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-BUILD_TARGETS="all"
-MODULESD_ATH_PCI_DOCS="README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="ath_hal(net:${S}/ath)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)"
-
-	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
-
-	if use amrr && use onoe; then
-		eerror
-		eerror "USE=\"amrr onoe\" is invalid, you can only specify one at a time."
-		eerror
-		die "USE=\"amrr onoe\" is invalid"
-	fi
-
-	if use amrr; then
-		MODULE_NAMES="${MODULE_NAMES} ath_rate_amrr(net:${S}/ath_rate/amrr)"
-		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/amrr"
-	elif use onoe; then
-		MODULE_NAMES="${MODULE_NAMES} ath_rate_onoe(net:${S}/ath_rate/onoe)"
-		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/onoe"
-	else
-		MODULE_NAMES="${MODULE_NAMES} ath_rate_sample(net:${S}/ath_rate/sample)"
-		BUILD_PARAMS="${BUILD_PARAMS} ATH_RATE=ath_rate/sample"
-	fi
-
-	MODULE_NAMES="${MODULE_NAMES} ath_pci(net:${S}/ath)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.9.2-{ath_intr,config.h,crypto_cipher_encrypt_one}.diff
-	for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-
-	epatch ${FILESDIR}/madwifi-ng-uudecode-gcda-fix.patch
-	if use injection; then epatch ${FILESDIR}/madwifi-ng-r1886.patch; fi
-#	epatch ${FILESDIR}/madwifi-association-fix.patch
-
-	epatch ${FILESDIR}/${P}-linux-2.6.20.patch
-	# Fix for madwifi bug 1016 and gentoo bug 157677.
-	# Thanks got Jon Howell for the patch and reporting upstream.
-	epatch ${FILESDIR}/${PN}-0.9.2-allow-cipher-none.diff
-}
-
-src_compile() {
-	# assists in debugging
-	emake KERNELPATH=${KV_OUT_DIR} info || die "emake info failed"
-
-	# needed by the modules
-	emake svnversion.h
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
-
-	# install headers for use by
-	# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins include/*.h
-	insinto /usr/include/madwifi/net80211
-	doins net80211/*.h
-}
-
-pkg_postinst() {
-	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
-
-	einfo "Removing old ath_rate modules"
-	if use amrr; then
-		[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
-		[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
-	elif use onoe; then
-		[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
-		[[ -f "${moddir}/ath_rate_sample.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_sample.${KV_OBJ}"
-	else
-		[[ -f "${moddir}/ath_rate_amrr.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_amrr.${KV_OBJ}"
-		[[ -f "${moddir}/ath_rate_onoe.${KV_OBJ}" ]] && rm "${moddir}/ath_rate_onoe.${KV_OBJ}"
-	fi
-
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
-	einfo "module."
-	einfo
-	einfo "The type of the created interface can be controlled through the 'autocreate'"
-	einfo "module parameter."
-	einfo
-	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
-	einfo "you should remerge them now."
-	einfo
-}
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r2.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r2.ebuild
deleted file mode 100644
index ca5ea57ae498..000000000000
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r2.ebuild,v 1.5 2007/04/09 19:53:25 cryos Exp $
-
-inherit linux-mod
-
-MY_P=${PN/-ng/}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
-HOMEPAGE="http://www.madwifi.org/"
-SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
-
-LICENSE="atheros-hal
-	|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/sharutils"
-RDEPEND="!net-wireless/madwifi-old
-		~net-wireless/madwifi-ng-tools-${PV:0:5}"
-
-CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-BUILD_TARGETS="all"
-MODULESD_ATH_PCI_DOCS="README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)
-				ath_rate_amrr(net:${S}/ath_rate/amrr)
-				ath_rate_onoe(net:${S}/ath_rate/onoe)
-				ath_rate_sample(net:${S}/ath_rate/sample)
-				ath_pci(net:${S}/ath)"
-
-	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-uudecode-gcda-fix.patch
-	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
-
-	# install headers for use by
-	# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins include/*.h
-	insinto /usr/include/madwifi/net80211
-	doins net80211/*.h
-}
-
-pkg_postinst() {
-	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
-
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
-	einfo "module."
-	einfo
-	einfo "The type of the created interface can be controlled through the 'autocreate'"
-	einfo "module parameter."
-	einfo
-	einfo "As of net-wireless/madwifi-ng-0.9.3 rate control module selection is done at"
-	einfo "module load time via the 'ratectl' module parameter. USE flags amrr and onoe"
-	einfo "no longer serve any purpose."
-	einfo
-	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
-	einfo "you should remerge them now."
-	einfo
-}
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
deleted file mode 100644
index 3f93498a6273..000000000000
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3-r3.ebuild,v 1.2 2007/05/13 14:49:12 genstef Exp $
-
-inherit linux-mod
-
-MY_P=${PN/-ng/}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Next Generation driver for Atheros based IEEE 802.11a/b/g wireless LAN cards"
-HOMEPAGE="http://www.madwifi.org/"
-SRC_URI="mirror://sourceforge/madwifi/madwifi-${PV}.tar.bz2"
-
-LICENSE="atheros-hal
-	|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="injection"
-
-DEPEND="app-arch/sharutils"
-RDEPEND="!net-wireless/madwifi-old
-		net-wireless/wireless-tools
-		~net-wireless/madwifi-ng-tools-${PV:0:5}"
-
-CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
-ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_NET_RADIO="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
-ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
-BUILD_TARGETS="all"
-MODULESD_ATH_PCI_DOCS="README"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="ath_hal(net:${S}/ath_hal)
-				wlan(net:${S}/net80211)
-				wlan_acl(net:${S}/net80211)
-				wlan_ccmp(net:${S}/net80211)
-				wlan_tkip(net:${S}/net80211)
-				wlan_wep(net:${S}/net80211)
-				wlan_xauth(net:${S}/net80211)
-				wlan_scan_sta(net:${S}/net80211)
-				wlan_scan_ap(net:${S}/net80211)
-				ath_rate_amrr(net:${S}/ath_rate/amrr)
-				ath_rate_onoe(net:${S}/ath_rate/onoe)
-				ath_rate_sample(net:${S}/ath_rate/sample)
-				ath_pci(net:${S}/ath)"
-
-	BUILD_PARAMS="KERNELPATH=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-uudecode-gcda-fix.patch
-	if use injection; then epatch ${FILESDIR}/${PN}-r1886.patch; fi
-	for dir in ath ath_hal net80211 ath_rate ath_rate/amrr ath_rate/onoe ath_rate/sample; do
-		convert_to_m ${S}/${dir}/Makefile
-	done
-
-	kernel_is ge 2 6 22 && epatch ${FILESDIR}/madwifi-2.6.22.patch
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README THANKS docs/users-guide.pdf docs/WEP-HOWTO.txt
-
-	# install headers for use by
-	# net-wireless/wpa_supplicant and net-wireless/hostapd
-	insinto /usr/include/madwifi/include/
-	doins include/*.h
-	insinto /usr/include/madwifi/net80211
-	doins net80211/*.h
-}
-
-pkg_postinst() {
-	local moddir="${ROOT}/lib/modules/${KV_FULL}/net/"
-
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "Interfaces (athX) are now automatically created upon loading the ath_pci"
-	einfo "module."
-	einfo
-	einfo "The type of the created interface can be controlled through the 'autocreate'"
-	einfo "module parameter."
-	einfo
-	einfo "As of net-wireless/madwifi-ng-0.9.3 rate control module selection is done at"
-	einfo "module load time via the 'ratectl' module parameter. USE flags amrr and onoe"
-	einfo "no longer serve any purpose."
-	einfo
-	einfo "If you use net-wireless/wpa_supplicant or net-wireless/hostapd with madwifi"
-	einfo "you should remerge them now."
-	einfo
-}
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
index f57b81349d2b..31654f5278db 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild,v 1.4 2007/06/02 18:55:43 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.3.1.ebuild,v 1.5 2007/07/07 11:01:13 genstef Exp $
 
 inherit linux-mod
 
@@ -24,7 +24,7 @@ RDEPEND="!net-wireless/madwifi-old
 
 CONFIG_CHECK="CRYPTO WIRELESS_EXT SYSCTL"
 ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)."
-ERROR_NET_RADIO="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
+ERROR_WIRELESS_EXT="${P} requires CONFIG_WIRELESS_EXT selected by Wireless LAN drivers (non-hamradio) & Wireless Extensions"
 ERROR_SYSCTL="${P} requires Sysctl support (CONFIG_SYSCTL)."
 BUILD_TARGETS="all"
 MODULESD_ATH_PCI_DOCS="README"