Pruned old ebuilds.

(Portage version: 2.0.54)

43 files changed, 25 insertions, 1961 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index f9cb308df5f2..daf6588efb34 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.58 2006/02/22 12:30:56 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.59 2006/02/23 13:55:14 brix Exp $
+
+  23 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/ipw2200-1.0.1-is_multicast_ether_addr.patch,
+  -files/ipw2200-1.0.1-suspend2.patch,
+  -files/ipw2200-1.0.3-is_multicast_ether_addr.patch,
+  -files/ipw2200-1.0.3-suspend2.patch,
+  -files/ipw2200-1.0.4-is_multicast_ether_addr.patch,
+  -files/ipw2200-1.0.6-a_txpow.patch, -files/ipw2200-1.0.6-broadcast.patch,
+  -files/ipw2200-1.0.6-channel_change_fw_err.patch,
+  -files/ipw2200-1.0.6-dup-without-retry.patch,
+  -files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch,
+  -files/ipw2200-1.0.6-ibss-wep.patch, -files/ipw2200-1.0.6-init_scan.patch,
+  -files/ipw2200-1.0.6-irq_override.patch,
+  -files/ipw2200-1.0.6-monitor_wep_fix.patch,
+  -files/ipw2200-1.0.6-open_frag.patch,
+  -files/ipw2200-1.0.6-pci_link-fix.patch,
+  -files/ipw2200-1.0.6-reset-mode-fix.patch,
+  -files/ipw2200-1.0.6-suspend2.patch, -files/ipw2200-1.0.7-broadcast.patch,
+  -files/ipw2200-1.0.7-wireless_ext-capa.patch, -ipw2200-1.0.1.ebuild,
+  -ipw2200-1.0.3.ebuild, -ipw2200-1.0.4.ebuild, -ipw2200-1.0.5.ebuild,
+  -ipw2200-1.0.6.ebuild, -ipw2200-1.0.6-r1.ebuild, -ipw2200-1.0.6-r2.ebuild,
+  -ipw2200-1.0.6-r3.ebuild, -ipw2200-1.0.7.ebuild, -ipw2200-1.0.7-r1.ebuild,
+  -ipw2200-1.0.8.ebuild:
+  Pruned old ebuilds.
 
   22 Feb 2006; Henrik Brix Andersen <brix@gentoo.org> ipw2200-1.0.10.ebuild:
   Stable on x86.
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.1 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.1
deleted file mode 100644
index d3e73c753246..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd5f54b88c6615dbfe6dc3e7fc592a8e ipw2200-1.0.1.tgz 130026
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.3 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.3
deleted file mode 100644
index ed84a5a75dc7..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a90c1126af04cdf958154d2164c1abe5 ipw2200-1.0.3.tgz 134799
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.4 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.4
deleted file mode 100644
index 8df44bd62bbc..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b79d75d78ec226ac1a05790dc185e732 ipw2200-1.0.4.tgz 148657
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.5 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.5
deleted file mode 100644
index 0bf72efe9848..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0229882678b3289e2f6bd0163739d86d ipw2200-1.0.5.tgz 112531
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6
deleted file mode 100644
index 53844e808285..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49f301ce8cffbd1cfbdb51061df3ac8 ipw2200-1.0.6.tgz 112932
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r1 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r1
deleted file mode 100644
index 53844e808285..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49f301ce8cffbd1cfbdb51061df3ac8 ipw2200-1.0.6.tgz 112932
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2
deleted file mode 100644
index 53844e808285..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49f301ce8cffbd1cfbdb51061df3ac8 ipw2200-1.0.6.tgz 112932
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r3 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r3
deleted file mode 100644
index 53844e808285..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d49f301ce8cffbd1cfbdb51061df3ac8 ipw2200-1.0.6.tgz 112932
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.7 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.7
deleted file mode 100644
index 2c7bb25e181c..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52fde406d510099dac34f5cccc009673 ipw2200-1.0.7.tgz 211838
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.7-r1 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.7-r1
deleted file mode 100644
index 2c7bb25e181c..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52fde406d510099dac34f5cccc009673 ipw2200-1.0.7.tgz 211838
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.8 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.8
deleted file mode 100644
index 3676bd12c29d..000000000000
--- a/net-wireless/ipw2200/files/digest-ipw2200-1.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5d32f7c0e126e1cef4fa76a3f331ab3 ipw2200-1.0.8.tgz 124713
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch b/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch
deleted file mode 100644
index a2fb8deb90f6..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.1-is_multicast_ether_addr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urp ipw2200-1.0.1/ieee80211.h ipw2200-1.0.1-is_multicast_ether_addr/ieee80211.h
---- ipw2200-1.0.1/ieee80211.h	2005-02-08 23:24:04.000000000 +0100
-+++ ipw2200-1.0.1-is_multicast_ether_addr/ieee80211.h	2005-06-24 23:26:36.000000000 +0200
-@@ -643,10 +643,12 @@ enum ieee80211_state {
- #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
- extern inline int is_multicast_ether_addr(const u8 *addr)
- {
- 	return ((addr[0] != 0xff) && (0x01 & addr[0]));
- }
-+#endif
- 
- extern inline int is_broadcast_ether_addr(const u8 *addr)
- {
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch b/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch
deleted file mode 100644
index c1fdb39894d4..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.1-suspend2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp ipw2200-1.0.1/ipw2200.c ipw2200-1.0.1-suspend2/ipw2200.c
---- ipw2200-1.0.1/ipw2200.c	2005-02-08 23:24:04.000000000 +0100
-+++ ipw2200-1.0.1-suspend2/ipw2200.c	2005-06-24 23:30:48.000000000 +0200
-@@ -7345,7 +7345,7 @@ static int ipw_setup_deferred_work(struc
- {
- 	int ret = 0;
- 
--#ifdef CONFIG_SOFTWARE_SUSPEND2
-+#ifdef PF_SYNCTHREAD
- 	priv->workqueue = create_workqueue(DRV_NAME, 0);
- #else
- 	priv->workqueue = create_workqueue(DRV_NAME);
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.3-is_multicast_ether_addr.patch b/net-wireless/ipw2200/files/ipw2200-1.0.3-is_multicast_ether_addr.patch
deleted file mode 100644
index 0629b376ae2a..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.3-is_multicast_ether_addr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp ipw2200-1.0.3/net/ieee80211.h ipw2200-1.0.3-is_multicast_ether_addr/net/ieee80211.h
---- ipw2200-1.0.3/net/ieee80211.h	2005-04-08 23:36:51.000000000 +0200
-+++ ipw2200-1.0.3-is_multicast_ether_addr/net/ieee80211.h	2005-06-20 12:22:48.000000000 +0200
-@@ -655,10 +655,12 @@ enum ieee80211_state {
- #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
- extern inline int is_multicast_ether_addr(const u8 *addr)
- {
- 	return ((addr[0] != 0xff) && (0x01 & addr[0]));
- }
-+#endif
- 
- extern inline int is_broadcast_ether_addr(const u8 *addr)
- {
-Only in ipw2200-1.0.3-is_multicast_ether_addr/net: ieee80211.h.orig
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch b/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch
deleted file mode 100644
index 100b7a5b09b4..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.3-suspend2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urp ipw2200-1.0.3/ipw2200.h ipw2200-1.0.3-suspend2/ipw2200.h
---- ipw2200-1.0.3/ipw2200.h	2005-04-08 23:36:51.000000000 +0200
-+++ ipw2200-1.0.3-suspend2/ipw2200.h	2005-05-05 21:39:40.000000000 +0200
-@@ -65,7 +65,8 @@ typedef void irqreturn_t;
- #endif
- 
- #if !defined(CONFIG_SOFTWARE_SUSPEND2_BUILTIN) && \
--	(defined(CONFIG_SOFTWARE_SUSPEND2) || \
-+	(defined(CONFIG_SUSPEND2) || \
-+	defined(CONFIG_SOFTWARE_SUSPEND2) ||		\
- 	defined(CONFIG_SOFTWARE_SUSPEND2_MODULE))
- #define CONFIG_SOFTWARE_SUSPEND2_BUILTIN
- #endif
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.4-is_multicast_ether_addr.patch b/net-wireless/ipw2200/files/ipw2200-1.0.4-is_multicast_ether_addr.patch
deleted file mode 100644
index 41fca2b919cf..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.4-is_multicast_ether_addr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urp ipw2200-1.0.4/net/ieee80211.h ipw2200-1.0.4-is_multicast_ether_addr/net/ieee80211.h
---- ipw2200-1.0.4/net/ieee80211.h	2005-05-17 22:11:08.000000000 +0200
-+++ ipw2200-1.0.4-is_multicast_ether_addr/net/ieee80211.h	2005-06-16 12:32:42.000000000 +0200
-@@ -718,10 +718,12 @@ enum ieee80211_state {
- #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
- 
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
- extern inline int is_multicast_ether_addr(const u8 *addr)
- {
- 	return ((addr[0] != 0xff) && (0x01 & addr[0]));
- }
-+#endif
- 
- extern inline int is_broadcast_ether_addr(const u8 *addr)
- {
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-a_txpow.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-a_txpow.patch
deleted file mode 100644
index 21d100949b59..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-a_txpow.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Fix firmware error when setting tx_power.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-a_txpow/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-07-14 03:00:28.000000000 +0800
-+++ ipw2200-1.0.6-a_txpow/ipw2200.c	2005-08-11 14:35:00.000000000 +0800
-@@ -2179,6 +2179,50 @@ static int ipw_send_tx_power(struct ipw_
- 	return 0;
- }
- 
-+static int ipw_set_tx_power(struct ipw_priv *priv)
-+{
-+	const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);
-+	struct ipw_tx_power tx_power;
-+	s8 max_power;
-+	int i;
-+
-+	memset(&tx_power, 0, sizeof(tx_power));
-+
-+	/* configure device for 'G' band */
-+	tx_power.ieee_mode = IPW_G_MODE;
-+	tx_power.num_channels = geo->bg_channels;
-+	for (i = 0; i < geo->bg_channels; i++) {
-+		max_power = geo->bg[i].max_power;
-+		tx_power.channels_tx_power[i].channel_number =
-+			geo->bg[i].channel;
-+		tx_power.channels_tx_power[i].tx_power = max_power ?
-+			min(max_power, priv->tx_power) : priv->tx_power;
-+	}
-+	if (ipw_send_tx_power(priv, &tx_power))
-+		return -EIO;
-+
-+	/* configure device to also handle 'B' band */
-+	tx_power.ieee_mode = IPW_B_MODE;
-+	if (ipw_send_tx_power(priv, &tx_power))
-+		return -EIO;
-+
-+	/* configure device to also handle 'A' band */
-+	if (priv->ieee->abg_true) {
-+		tx_power.ieee_mode = IPW_A_MODE;
-+		tx_power.num_channels = geo->a_channels;
-+		for (i = 0; i < tx_power.num_channels; i++) {
-+			max_power = geo->a[i].max_power;
-+			tx_power.channels_tx_power[i].channel_number =
-+				geo->a[i].channel;
-+			tx_power.channels_tx_power[i].tx_power = max_power ?
-+				min(max_power, priv->tx_power) : priv->tx_power;
-+		}
-+		if (ipw_send_tx_power(priv, &tx_power))
-+			return -EIO;
-+	}
-+	return 0;
-+}
-+
- static int ipw_send_rts_threshold(struct ipw_priv *priv, u16 rts)
- {
- 	struct ipw_rts_threshold rts_threshold = {
-@@ -8744,83 +8788,38 @@ static int ipw_wx_get_rts(struct net_dev
- 	return 0;
- }
- 
--
- static int ipw_wx_set_txpow(struct net_device *dev,
- 			    struct iw_request_info *info,
- 			    union iwreq_data *wrqu, char *extra)
- {
- 	struct ipw_priv *priv = ieee80211_priv(dev);
--	const struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);
--	struct ipw_tx_power tx_power;
--	int i;
-+	int err = 0;
- 
- 	down(&priv->sem);
- 	if (ipw_radio_kill_sw(priv, wrqu->power.disabled)) {
--		up(&priv->sem);
--		return -EINPROGRESS;
-+		err = -EINPROGRESS;
-+		goto out;
- 	}
- 
- 	if (!wrqu->power.fixed)
- 		wrqu->power.value = IPW_TX_POWER_DEFAULT;
- 
- 	if (wrqu->power.flags != IW_TXPOW_DBM) {
--		up(&priv->sem);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto out;
- 	}
- 
- 	if ((wrqu->power.value > IPW_TX_POWER_MAX) ||
- 	    (wrqu->power.value < IPW_TX_POWER_MIN)) {
--		up(&priv->sem);
--		return -EINVAL;
-+		err = -EINVAL;
-+		goto out;
- 	}
- 
- 	priv->tx_power = wrqu->power.value;
--
--	memset(&tx_power, 0, sizeof(tx_power));
--
--	/* configure device for 'G' band */
--	tx_power.ieee_mode = IPW_G_MODE;
--	tx_power.num_channels = geo->bg_channels;
--	for (i = 0; i < geo->bg_channels; i++) {
--		int max_power = geo->bg[i].max_power;
--
--		tx_power.channels_tx_power[i].channel_number = i + 1;
--		if (max_power != 0 && priv->tx_power > max_power)
--			tx_power.channels_tx_power[i].tx_power = max_power;
--		else
--			tx_power.channels_tx_power[i].tx_power = priv->tx_power;
--	}
--	if (ipw_send_tx_power(priv, &tx_power))
--		goto error;
--
--	/* configure device to also handle 'B' band */
--	tx_power.ieee_mode = IPW_B_MODE;
--	if (ipw_send_tx_power(priv, &tx_power))
--		goto error;
--
--	/* configure device to also handle 'A' band */
--	if (priv->ieee->abg_true) {
--		tx_power.ieee_mode = IPW_A_MODE;
--		tx_power.num_channels = geo->a_channels;
--		for (i = 0; i < geo->a_channels; i++) {
--			int max_power = geo->a[i].max_power;
--
--			tx_power.channels_tx_power[i].channel_number = i + 1;
--			if (max_power != 0 && priv->tx_power > max_power)
--				tx_power.channels_tx_power[i].tx_power = max_power;
--			else
--				tx_power.channels_tx_power[i].tx_power = priv->tx_power;
--		}
--		if (ipw_send_tx_power(priv, &tx_power))
--			goto error;
--	}
--
--	up(&priv->sem);
--	return 0;
--
-- error:
-+	err = ipw_set_tx_power(priv);
-+out:
- 	up(&priv->sem);
--	return -EIO;
-+	return err;
- }
- 
- 
-@@ -10302,29 +10301,10 @@ static int init_supported_rates(struct i
- 
- static int ipw_config(struct ipw_priv *priv)
- {
--	int i;
--	struct ipw_tx_power tx_power;
--
--	memset(&priv->sys_config, 0, sizeof(priv->sys_config));
--	memset(&tx_power, 0, sizeof(tx_power));
--
- 	/* This is only called from ipw_up, which resets/reloads the firmware
- 	   so, we don't need to first disable the card before we configure
- 	   it */
--
--	/* configure device for 'G' band */
--	tx_power.ieee_mode = IPW_G_MODE;
--	tx_power.num_channels = 11;
--	for (i = 0; i < 11; i++) {
--		tx_power.channels_tx_power[i].channel_number = i + 1;
--		tx_power.channels_tx_power[i].tx_power = priv->tx_power;
--	}
--	if (ipw_send_tx_power(priv, &tx_power))
--		goto error;
--
--	/* configure device to also handle 'B' band */
--	tx_power.ieee_mode = IPW_B_MODE;
--	if (ipw_send_tx_power(priv, &tx_power))
-+	if (ipw_set_tx_power(priv))
- 		goto error;
- 
- 	/* initialize adapter address */
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch
deleted file mode 100644
index 0c3f8e386bd1..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-broadcast/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-07-13 21:00:28.000000000 +0200
-+++ ipw2200-1.0.6-broadcast/ipw2200.c	2005-09-02 19:39:01.000000000 +0200
-@@ -7669,7 +7669,8 @@ static inline int is_network_packet(stru
- 			return 0;
- 
- 		/* multicast packets to our IBSS go through */
--		if (is_multicast_ether_addr(header->addr1))
-+		if (is_multicast_ether_addr(header->addr1) ||
-+                    is_broadcast_ether_addr(header->addr1))
- 			return !memcmp(header->addr3, priv->bssid, ETH_ALEN);
- 
- 		/* packets to our adapter go through */
-@@ -7682,7 +7683,8 @@ static inline int is_network_packet(stru
- 			return 0;
- 
- 		/* {broad,multi}cast packets to our IBSS go through */
--		if (is_multicast_ether_addr(header->addr1))
-+		if (is_multicast_ether_addr(header->addr1) ||
-+                    is_broadcast_ether_addr(header->addr1))
- 			return !memcmp(header->addr2, priv->bssid, ETH_ALEN);
- 
- 		/* packets to our adapter go through */
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-channel_change_fw_err.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-channel_change_fw_err.patch
deleted file mode 100644
index e270aa936899..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-channel_change_fw_err.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-[Bug 455] Fix frequent channel change generates firmware fatal error.
-
-Because of the frequent channel change, it is possible that when we are
-try to associate with channel 1 (authenticated but not associated).
-Another channel change comes at this time, then the driver will issue
-disassociate command to the firmware which will cause the fatal error.
-
-It seems that the association/disassociation procedure should not be
-interrupted.
-
-The patch attached adds test on STATUS_ASSOCIATING | STATUS_DISASSOCIATING
-in ipw_send_cmd(), when ensures that commands will not be sent to firmware
-when we are in these two status.
-
-Signed-off-by: Hong Liu <hong.liu@intel.com>
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -Nurp ipw2200-1.0.6-orig/ipw2200.c ipw2200-1.0.6/ipw2200.c
---- ipw2200-1.0.6-orig/ipw2200.c	2005-04-12 17:03:02.000000000 +0800
-+++ ipw2200-1.0.6/ipw2200.c	2005-04-13 13:42:03.496914912 +0800
-@@ -1592,6 +1592,18 @@ static int ipw_send_cmd(struct ipw_priv 
- 		return -1;
- 	}
- 
-+	if (priv->status & STATUS_ASSOCIATING) {
-+		IPW_DEBUG_HC("abandon a command while associating\n");
-+		spin_unlock_irqrestore(&priv->lock, flags);
-+		return -1;
-+	}
-+
-+	if (priv->status & STATUS_DISASSOCIATING) {
-+		IPW_DEBUG_HC("abandon a command while disassociating\n");
-+		spin_unlock_irqrestore(&priv->lock, flags);
-+		return -1;
-+	}
-+
- 	priv->status |= STATUS_HCMD_ACTIVE;
- 
- 	IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
-@@ -3385,14 +3397,17 @@ static void ipw_send_disassociate(struct
- 		return;
- 	}
- 
-+	if (priv->status & STATUS_ASSOCIATING) {
-+		IPW_DEBUG_ASSOC("Disassociating while associating.\n");
-+		queue_work(priv->workqueue, &priv->disassociate);
-+		return;
-+	}
-+
- 	IPW_DEBUG_ASSOC("Disassocation attempt from " MAC_FMT " "
- 			"on channel %d.\n",
- 			MAC_ARG(priv->assoc_request.bssid),
- 			priv->assoc_request.channel);
- 
--	priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
--	priv->status |= STATUS_DISASSOCIATING;
--
- 	if (quiet)
- 		priv->assoc_request.assoc_type = HC_DISASSOC_QUIET;
- 	else
-@@ -3404,6 +3419,9 @@ static void ipw_send_disassociate(struct
- 		return;
- 	}
- 
-+	priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
-+	priv->status |= STATUS_DISASSOCIATING;
-+
- }
- 
- static int ipw_disassociate(void *data)
-@@ -6093,8 +6111,6 @@ static int ipw_associate_network(struct 
- 	 */
- 	priv->channel = network->channel;
- 	memcpy(priv->bssid, network->bssid, ETH_ALEN);
--	priv->status |= STATUS_ASSOCIATING;
--	priv->status &= ~STATUS_SECURITY_UPDATED;
- 
- 	priv->assoc_network = network;
- 
-@@ -6104,6 +6120,9 @@ static int ipw_associate_network(struct 
- 		return err;
- 	}
- 
-+	priv->status |= STATUS_ASSOCIATING;
-+	priv->status &= ~STATUS_SECURITY_UPDATED;
-+
- 	IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n",
- 		  escape_essid(priv->essid, priv->essid_len),
- 		  MAC_ARG(priv->bssid));
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-dup-without-retry.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-dup-without-retry.patch
deleted file mode 100644
index 7f79ec0fd32d..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-dup-without-retry.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Walkaround kernel BUG_ON panic caused by unexpected duplicate packets.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
----
-
- ipw2200-1.0.6-chuyee/ipw2200.c |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff -puN ipw2200.c~dup-without-retry ipw2200.c
---- ipw2200-1.0.6/ipw2200.c~dup-without-retry	2005-08-03 13:59:11.000000000 +0800
-+++ ipw2200-1.0.6-chuyee/ipw2200.c	2005-08-03 14:51:52.000000000 +0800
-@@ -7698,7 +7698,6 @@ static inline int is_network_packet(stru
- static inline int is_duplicate_packet(struct ipw_priv *priv,
- 				      struct ieee80211_hdr *header)
- {
--	u16 fc = le16_to_cpu(header->frame_ctl);
- 	u16 sc = le16_to_cpu(header->seq_ctl);
- 	u16 seq = WLAN_GET_SEQ_SEQ(sc);
- 	u16 frag = WLAN_GET_SEQ_FRAG(sc);
-@@ -7759,7 +7758,10 @@ static inline int is_duplicate_packet(st
- 	return 0;
- 
- drop:
--	BUG_ON(!(fc & IEEE80211_FCTL_RETRY));
-+	/* Comment this line now since we observed the card receives
-+	 * duplicate packets but the FCTL_RETRY bit is not set in the
-+	 * IBSS mode with fragmentation enabled.
-+	BUG_ON(!(le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_RETRY)); */
- 	return 1;
- }
- 
-_
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch
deleted file mode 100644
index f8caa441ab77..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-fix4/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-08-03 13:06:51.000000000 +0800
-+++ ipw2200-1.0.6-fix4/ipw2200.c	2005-08-03 13:07:14.000000000 +0800
-@@ -5576,6 +5576,55 @@ static void ipw_send_wep_keys(struct ipw
- 	}
- }
- 
-+static void ipw_set_hw_decrypt_unicast(struct ipw_priv *priv, int level)
-+{
-+	if (priv->ieee->host_encrypt)
-+		return;
-+
-+	switch (level) {
-+	case SEC_LEVEL_3:
-+		priv->sys_config.disable_unicast_decryption = 0;
-+		priv->ieee->host_decrypt = 0;
-+		break;
-+	case SEC_LEVEL_2:
-+		priv->sys_config.disable_unicast_decryption = 1;
-+		priv->ieee->host_decrypt = 1;
-+		break;
-+	case SEC_LEVEL_1:
-+		priv->sys_config.disable_unicast_decryption = 0;
-+		priv->ieee->host_decrypt = 0;
-+		break;
-+	case SEC_LEVEL_0:
-+		priv->sys_config.disable_unicast_decryption = 1;
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+static void ipw_set_hw_decrypt_multicast(struct ipw_priv *priv, int level)
-+{
-+	if (priv->ieee->host_encrypt)
-+		return;
-+
-+	switch (level) {
-+	case SEC_LEVEL_3:
-+		priv->sys_config.disable_multicast_decryption = 0;
-+		break;
-+	case SEC_LEVEL_2:
-+		priv->sys_config.disable_multicast_decryption = 1;
-+		break;
-+	case SEC_LEVEL_1:
-+		priv->sys_config.disable_multicast_decryption = 0;
-+		break;
-+	case SEC_LEVEL_0:
-+		priv->sys_config.disable_multicast_decryption = 1;
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
- static void ipw_set_hwcrypto_keys(struct ipw_priv *priv)
- {
- 	switch (priv->ieee->sec.level) {
-@@ -5586,33 +5635,23 @@ static void ipw_set_hwcrypto_keys(struct
- 				priv->ieee->sec.active_key);
- 
- 		ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_CCM);
--		priv->sys_config.disable_unicast_decryption = 0;
--		priv->sys_config.disable_multicast_decryption = 0;
--		priv->ieee->host_decrypt = 0;
- 		break;
- 	case SEC_LEVEL_2:
- 		if (priv->ieee->sec.flags & SEC_ACTIVE_KEY)
- 			ipw_send_tgi_tx_key(priv,
- 				DCT_FLAG_EXT_SECURITY_TKIP,
- 				priv->ieee->sec.active_key);
--
--		priv->sys_config.disable_unicast_decryption = 1;
--		priv->sys_config.disable_multicast_decryption = 1;
--		priv->ieee->host_decrypt = 1;
- 		break;
- 	case SEC_LEVEL_1:
- 		ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP);
--		priv->sys_config.disable_unicast_decryption = 0;
--		priv->sys_config.disable_multicast_decryption = 0;
--		priv->ieee->host_decrypt = 0;
- 		break;
- 	case SEC_LEVEL_0:
--		priv->sys_config.disable_unicast_decryption = 1;
--		priv->sys_config.disable_multicast_decryption = 1;
--		break;
- 	default:
- 		break;
- 	}
-+
-+	ipw_set_hw_decrypt_unicast(priv, priv->ieee->sec.level);
-+	ipw_set_hw_decrypt_multicast(priv, priv->ieee->sec.level);
- }
- 
- static void ipw_adhoc_check(void *data)
-@@ -6194,12 +6233,31 @@ static int ipw_wpa_mlme(struct net_devic
- 	return ret;
- }
- 
-+static int ipw_wpa_ie_cipher2level(u8 cipher)
-+{
-+	switch (cipher) {
-+		case 4: /* CCMP */
-+			return SEC_LEVEL_3;
-+		case 2: /* TKIP */
-+			return SEC_LEVEL_2;
-+		case 5: /* WEP104 */
-+		case 1: /* WEP40 */
-+			return SEC_LEVEL_1;
-+		case 0: /* NONE */
-+			return SEC_LEVEL_0;
-+		default:
-+			return -1;
-+	}
-+}
-+
- static int ipw_wpa_set_wpa_ie(struct net_device *dev,
- 			      struct ipw_param *param, int plen)
- {
- 	struct ipw_priv *priv = ieee80211_priv(dev);
- 	struct ieee80211_device *ieee = priv->ieee;
- 	u8 *buf;
-+	u8 *ptk, *gtk;
-+	int level;
- 
- 	if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
- 	    (param->u.wpa_ie.len && param->u.wpa_ie.data == NULL))
-@@ -6218,8 +6276,35 @@ static int ipw_wpa_set_wpa_ie(struct net
- 		kfree(ieee->wpa_ie);
- 		ieee->wpa_ie = NULL;
- 		ieee->wpa_ie_len = 0;
-+		goto done;
-+	}
-+
-+	if (priv->ieee->host_encrypt)
-+		goto done;
-+
-+	/* HACK: Parse wpa_ie here to get pairwise suite, otherwise
-+	 * we need to change driver_ipw.c from wpa_supplicant. This
-+	 * is OK since -Dipw is deprecated. The -Dwext driver has a
-+	 * clean way to handle this. */
-+	gtk = ptk = (u8 *)ieee->wpa_ie;
-+	if (ieee->wpa_ie[0] == 0x30) { /* RSN IE */
-+		gtk += 4 + 3;
-+		ptk += 4 + 4 + 2 + 3;
-+	} else { /* WPA IE */
-+		gtk += 8 + 3;
-+		ptk += 8 + 4 + 2 + 3;
- 	}
- 
-+	if (ptk - (u8 *)ieee->wpa_ie > ieee->wpa_ie_len)
-+		return -EINVAL;
-+
-+	level = ipw_wpa_ie_cipher2level(*gtk);
-+	ipw_set_hw_decrypt_multicast(priv, level);
-+
-+	level = ipw_wpa_ie_cipher2level(*ptk);
-+	ipw_set_hw_decrypt_unicast(priv, level);
-+
-+done:
- 	ipw_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len);
- 	return 0;
- }
-@@ -6523,6 +6608,23 @@ out:
- 	return err;
- }
- 
-+static int wext_cipher2level(int cipher)
-+{
-+	switch (cipher) {
-+	case IW_AUTH_CIPHER_NONE:
-+		return SEC_LEVEL_0;
-+	case IW_AUTH_CIPHER_WEP40:
-+	case IW_AUTH_CIPHER_WEP104:
-+		return SEC_LEVEL_1;
-+	case IW_AUTH_CIPHER_TKIP:
-+		return SEC_LEVEL_2;
-+	case IW_AUTH_CIPHER_CCMP:
-+		return SEC_LEVEL_3;
-+	default:
-+		return -1;
-+	}
-+}
-+
- /* SIOCSIWAUTH */
- static int ipw_wx_set_auth(struct net_device *dev,
- 			   struct iw_request_info *info,
-@@ -6535,8 +6637,15 @@ static int ipw_wx_set_auth(struct net_de
- 
- 	switch (param->flags & IW_AUTH_INDEX) {
- 	case IW_AUTH_WPA_VERSION:
-+		break;
- 	case IW_AUTH_CIPHER_PAIRWISE:
-+		ipw_set_hw_decrypt_unicast(
-+			priv, wext_cipher2level(param->value));
-+		break;
- 	case IW_AUTH_CIPHER_GROUP:
-+		ipw_set_hw_decrypt_multicast(
-+			priv, wext_cipher2level(param->value));
-+		break;
- 	case IW_AUTH_KEY_MGMT:
- 		/*
- 		 * ipw2200 does not use these parameters
-@@ -10249,11 +10358,11 @@ static void shim__set_security(struct ne
- 		priv->ieee->sec.level = sec->level;
- 		priv->ieee->sec.flags |= SEC_LEVEL;
- 		priv->status |= STATUS_SECURITY_UPDATED;
--
--		if (!priv->ieee->host_encrypt && (sec->flags & SEC_ENCRYPT))
--			ipw_set_hwcrypto_keys(priv);
- 	}
- 
-+	if (!priv->ieee->host_encrypt && (sec->flags & SEC_ENCRYPT))
-+		ipw_set_hwcrypto_keys(priv);
-+
- 	/* To match current functionality of ipw2100 (which works well w/
- 	 * various supplicants, we don't force a disassociate if the
- 	 * privacy capability changes ... */
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-ibss-wep.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-ibss-wep.patch
deleted file mode 100644
index 00dbf4708221..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-ibss-wep.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: Hong Liu <hong.liu@intel.com>
-
-This patch fixes the ah-hoc network issue.  
-
-If we configure the wep keys after creating the ibss network, the
-beacons of this network will not show correctly (it still shows "key
-off" in iwlist scan report). This is because we don't update the
-beacon info in firmware.
-
-Signed-off-by: Hong Liu <hong.liu@intel.com>
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
----
-
- ipw2200-1.0.6-chuyee/ipw2200.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletion(-)
-
-diff -puN ipw2200.c~ibss-wep ipw2200.c
---- ipw2200-1.0.6/ipw2200.c~ibss-wep	2005-07-15 14:40:29.000000000 +0800
-+++ ipw2200-1.0.6-chuyee/ipw2200.c	2005-07-15 14:46:02.000000000 +0800
-@@ -9053,11 +9053,19 @@ static int ipw_wx_set_encode(struct net_
- {
- 	struct ipw_priv *priv = ieee80211_priv(dev);
- 	int ret;
-+	u32 cap = priv->capability;
- 
- 	down(&priv->sem);
- 	ret = ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
--	up(&priv->sem);
- 
-+	/* In IBSS mode, we need to notify the firmware to update
-+	 * the beacon info after we changed the capability. */
-+	if (cap != priv->capability &&
-+	    priv->ieee->iw_mode == IW_MODE_ADHOC &&
-+	    priv->status & STATUS_ASSOCIATED)
-+		ipw_disassociate(priv);
-+
-+	up(&priv->sem);
- 	return ret;
- }
- 
-_
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-init_scan.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-init_scan.patch
deleted file mode 100644
index 06210bc9cd97..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-init_scan.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[Bug 751] Fix driver association requires manual scan.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-init_scan/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-07-14 03:00:28.000000000 +0800
-+++ ipw2200-1.0.6-init_scan/ipw2200.c	2005-08-11 12:38:34.000000000 +0800
-@@ -10428,13 +10428,13 @@ static int ipw_up(struct ipw_priv *priv)
- 			return 0;
- 		}
- 
-+		priv->status |= STATUS_INIT;
- 		rc = ipw_config(priv);
- 		if (!rc) {
- 			IPW_DEBUG_INFO("Configured device on count %i\n", i);
- 			ipw_led_init(priv);
- 			ipw_led_radio_on(priv);
- 			priv->notif_missed_beacons = 0;
--			priv->status |= STATUS_INIT;
- 
- 			/* Set hardware WEP key if it is configured. */
- 			if ((priv->capability & CAP_PRIVACY_ON) &&
-@@ -10445,6 +10445,7 @@ static int ipw_up(struct ipw_priv *priv)
- 
- 			return 0;
- 		}
-+		priv->status &= ~STATUS_INIT;
- 
- 		IPW_DEBUG_INFO("Device configuration failed: 0x%08X\n", rc);
- 		IPW_DEBUG_INFO("Failed to config device on retry %d of %d\n",
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-irq_override.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-irq_override.patch
deleted file mode 100644
index b363afe919c9..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-irq_override.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Add ability to override default irq assigned by the system. This is used
-to debug IRQ related problems.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-irq/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-08-10 10:29:25.000000000 +0800
-+++ ipw2200-1.0.6-irq/ipw2200.c	2005-08-15 17:24:50.000000000 +0800
-@@ -52,6 +52,7 @@ static int auto_create = 1;
- static int led = 0;
- static int disable = 0;
- static int hwcrypto = 1;
-+static int irq = 0;
- static const char ipw_modes[] = {
- 	'a', 'b', 'g', '?'
- };
-@@ -10714,6 +10715,11 @@ static int ipw_pci_probe(struct pci_dev 
- 
- 	ipw_sw_reset(priv, 1);
- 
-+	if (irq) {
-+		printk(KERN_INFO "Override default irq from %d to %d.\n",
-+		       pdev->irq, irq);
-+		pdev->irq = irq;
-+	}
- 	err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);
- 	if (err) {
- 		IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
-@@ -11004,5 +11010,8 @@ MODULE_PARM_DESC(mode, "network mode (0=
- module_param(hwcrypto, int, 0444);
- MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)");
- 
-+module_param(irq, int, 0444);
-+MODULE_PARM_DESC(irq, "override defualt irq assigned by the system");
-+
- module_exit(ipw_exit);
- module_init(ipw_init);
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-monitor_wep_fix.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-monitor_wep_fix.patch
deleted file mode 100644
index 51a783e46b05..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-monitor_wep_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-[Bug 760] Fix setting WEP key in monitor mode causes IV lost.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-monitor_wep/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-08-25 11:13:57.000000000 +0800
-+++ ipw2200-1.0.6-monitor_wep/ipw2200.c	2005-08-25 11:14:19.000000000 +0800
-@@ -7648,7 +7648,8 @@ static void ipw_handle_data_packet(struc
- 	IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len);
- 
- 	/* HW decrypt will not clear the WEP bit, MIC, PN, etc. */
--	if (!priv->ieee->host_decrypt)
-+	if (!priv->ieee->host_decrypt &&
-+	    priv->ieee->iw_mode != IW_MODE_MONITOR)
- 		ipw_rebuild_decrypted_skb(priv, rxb->skb);
- 
- 	if (!ieee80211_rx(priv->ieee, rxb->skb, stats))
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-open_frag.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-open_frag.patch
deleted file mode 100644
index 25ec763e3c53..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-open_frag.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Disable host fragementation in open mode since hardware support it.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
----
-
- ipw2200-1.0.6-chuyee/ipw2200.c |    3 +++
- 1 files changed, 3 insertions(+)
-
-diff -L ipw2100.c -puN /dev/null /dev/null
-diff -puN ipw2200.c~open_frag ipw2200.c
---- ipw2200-1.0.6/ipw2200.c~open_frag	2005-08-03 15:54:41.000000000 +0800
-+++ ipw2200-1.0.6-chuyee/ipw2200.c	2005-08-03 15:56:55.000000000 +0800
-@@ -8050,6 +8050,9 @@ static int ipw_sw_reset(struct ipw_priv 
- 	}
- 	IPW_DEBUG_INFO("Hardware crypto [%s]\n", hwcrypto ? "on" : "off");
- 
-+	/* IPW2200/2915 is abled to do hardware fragmentation. */
-+	priv->ieee->host_open_frag = 0;
-+
- 	if ((priv->pci_dev->device == 0x4223) ||
- 	    (priv->pci_dev->device == 0x4224)) {
- 		if (init)
-_
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-pci_link-fix.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-pci_link-fix.patch
deleted file mode 100644
index 1e111ca8b6ed..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-pci_link-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Free irq in ->suspend and request irq in ->resume to be compliant with
-the latest PM request (Documentation/power/pci.txt).
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-pci_link/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-08-10 10:29:25.000000000 +0800
-+++ ipw2200-1.0.6-pci_link/ipw2200.c	2005-08-10 10:36:06.000000000 +0800
-@@ -10856,6 +10856,7 @@ static int ipw_pci_suspend(struct pci_de
- 
-  	/* Take down the device; powers it off, etc. */
- 	ipw_down(priv);
-+	free_irq(pdev->irq, priv);
- 
- 	/* Remove the PRESENT state of the device */
- 	netif_device_detach(dev);
-@@ -10881,6 +10882,7 @@ static int ipw_pci_resume(struct pci_dev
- 	struct ipw_priv *priv = pci_get_drvdata(pdev);
- 	struct net_device *dev = priv->net_dev;
- 	u32 val;
-+	int err;
- 
- 	printk(KERN_INFO "%s: Coming out of suspend...\n", dev->name);
- 
-@@ -10905,6 +10907,12 @@ static int ipw_pci_resume(struct pci_dev
- 	if ((val & 0x0000ff00) != 0)
- 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
- 
-+	err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);
-+	if (err) {
-+		IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
-+		return err;
-+	}
-+
- 	/* Set the device back into the PRESENT state; this will also wake
- 	 * the queue of needed */
- 	netif_device_attach(dev);
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-reset-mode-fix.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-reset-mode-fix.patch
deleted file mode 100644
index 9d49f98c9aab..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-reset-mode-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-[Bug 701] Fix a misuse of ieee->mode with ieee->iw_mode.
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
----
-
- ipw2200-1.0.6-chuyee/ipw2200.c |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff -puN ipw2200.c~reset-mode-fix ipw2200.c
---- ipw2200-1.0.6/ipw2200.c~reset-mode-fix	2005-07-15 14:21:25.000000000 +0800
-+++ ipw2200-1.0.6-chuyee/ipw2200.c	2005-07-15 14:22:34.000000000 +0800
-@@ -8093,7 +8093,7 @@ static int ipw_sw_reset(struct ipw_priv 
- 	priv->power_mode = IPW_POWER_AC;
- 	priv->tx_power = IPW_TX_POWER_DEFAULT;
- 
--	return old_mode == priv->ieee->mode;
-+	return old_mode == priv->ieee->iw_mode;
- }
- 
- 
-_
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-suspend2.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-suspend2.patch
deleted file mode 100644
index 4c074f0716c1..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.6-suspend2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-suspend2/ipw2200.c
---- ipw2200-1.0.6/ipw2200.c	2005-07-13 21:00:28.000000000 +0200
-+++ ipw2200-1.0.6-suspend2/ipw2200.c	2005-08-29 18:18:05.000000000 +0200
-@@ -10146,11 +10146,7 @@ static int ipw_setup_deferred_work(struc
- {
- 	int ret = 0;
- 
--#ifdef PF_SYNCTHREAD
--	priv->workqueue = create_workqueue(DRV_NAME, 0);
--#else
- 	priv->workqueue = create_workqueue(DRV_NAME);
--#endif
- 	init_waitqueue_head(&priv->wait_command_queue);
- 	init_waitqueue_head(&priv->wait_state);
- 
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.7-broadcast.patch b/net-wireless/ipw2200/files/ipw2200-1.0.7-broadcast.patch
deleted file mode 100644
index da91fe321d39..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.7-broadcast.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -urp ipw2200-1.0.7/ipw2200.c ipw2200-1.0.7-broadcast/ipw2200.c
---- ipw2200-1.0.7/ipw2200.c	2005-10-14 02:11:50.000000000 +0800
-+++ ipw2200-1.0.7-broadcast/ipw2200.c	2005-10-19 15:47:10.000000000 +0800
-@@ -7982,6 +7982,12 @@ static void ipw_rebuild_decrypted_skb(st
- 	}
- }
- 
-+static inline int ipw_is_broadcast_ether_addr(const u8 * addr)
-+{
-+	return (addr[0] & 0xff && addr[1] & 0xff && addr[2] & 0xff &&
-+		addr[3] & 0xff && addr[4] & 0xff && addr[5] & 0xff);
-+}
-+
- static void ipw_handle_data_packet(struct ipw_priv *priv,
- 				   struct ipw_rx_mem_buffer *rxb,
- 				   struct ieee80211_rx_stats *stats)
-@@ -8018,8 +8024,9 @@ static void ipw_handle_data_packet(struc
- 	/* HW decrypt will not clear the WEP bit, MIC, PN, etc. */
- 	hdr = (struct ieee80211_hdr_4addr *)rxb->skb->data;
- 	if (priv->ieee->iw_mode != IW_MODE_MONITOR &&
--	    (is_multicast_ether_addr(hdr->addr1) ?
--	     !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt))
-+	    ((is_multicast_ether_addr(hdr->addr1) ||
-+	      ipw_is_broadcast_ether_addr(hdr->addr1)) ?
-+	      !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt))
- 		ipw_rebuild_decrypted_skb(priv, rxb->skb);
- 
- 	if (!ieee80211_rx(priv->ieee, rxb->skb, stats))
-@@ -8197,12 +8204,6 @@ static void ipw_handle_data_packet_monit
- }
- #endif
- 
--static inline int ipw_is_broadcast_ether_addr(const u8 * addr)
--{
--	return (addr[0] & 0xff && addr[1] & 0xff && addr[2] & 0xff &&
--		addr[3] & 0xff && addr[4] & 0xff && addr[5] & 0xff);
--}
--
- static inline int is_network_packet(struct ipw_priv *priv,
- 				    struct ieee80211_hdr_4addr *header)
- {
-@@ -10225,7 +10226,8 @@ static inline int ipw_tx_skb(struct ipw_
- 	switch (priv->ieee->iw_mode) {
- 	case IW_MODE_ADHOC:
- 		hdr_len = IEEE80211_3ADDR_LEN;
--		unicast = !is_multicast_ether_addr(hdr->addr1);
-+		unicast = !(is_multicast_ether_addr(hdr->addr1) ||
-+			    ipw_is_broadcast_ether_addr(hdr->addr1));
- 		id = ipw_find_station(priv, hdr->addr1);
- 		if (id == IPW_INVALID_STATION) {
- 			id = ipw_add_station(priv, hdr->addr1);
-@@ -10240,7 +10242,8 @@ static inline int ipw_tx_skb(struct ipw_
- 
- 	case IW_MODE_INFRA:
- 	default:
--		unicast = !is_multicast_ether_addr(hdr->addr3);
-+		unicast = !(is_multicast_ether_addr(hdr->addr3) ||
-+			    ipw_is_broadcast_ether_addr(hdr->addr3));
- 		hdr_len = IEEE80211_3ADDR_LEN;
- 		id = 0;
- 		break;
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.7-wireless_ext-capa.patch b/net-wireless/ipw2200/files/ipw2200-1.0.7-wireless_ext-capa.patch
deleted file mode 100644
index 744711540229..000000000000
--- a/net-wireless/ipw2200/files/ipw2200-1.0.7-wireless_ext-capa.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nup ipw2200-1.0.7-orig/ipw2200.c ipw2200-1.0.7/ipw2200.c
---- ipw2200-1.0.7-orig/ipw2200.c	2005-10-19 15:21:46.000000000 -0500
-+++ ipw2200-1.0.7/ipw2200.c	2005-10-19 15:21:40.000000000 -0500
-@@ -8980,11 +8980,13 @@ static int ipw_wx_get_range(struct net_d
- 
- 	up(&priv->sem);
- 
-+#if WIRELESS_EXT >= 17
- 	/* Event capability (kernel + driver) */
- 	range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
- 				IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |
- 				IW_EVENT_CAPA_MASK(SIOCGIWAP));
- 	range->event_capa[1] = IW_EVENT_CAPA_K_1;
-+#endif
- 
- 	IPW_DEBUG_WX("GET Range\n");
- 	return 0;
-@@ -10102,7 +10104,9 @@ static struct iw_handler_def ipw_wx_hand
- 	.num_private_args = ARRAY_SIZE(ipw_priv_args),
- 	.private = ipw_priv_handler,
- 	.private_args = ipw_priv_args,
-+#if WIRELESS_EXT >= 17
- 	.get_wireless_stats = ipw_get_wireless_stats,
-+#endif
- };
- 
- /*
-@@ -11622,9 +11626,12 @@ static int ipw_pci_probe(struct pci_dev 
- 	priv->wireless_data.ieee80211 = priv->ieee;
- 	net_dev->wireless_data = &priv->wireless_data;
- #else
-+	net_dev->get_wireless_stats = ipw_get_wireless_stats;
-+#if WIRELESS_EXT == 16
- 	ipw_wx_handler_def.spy_offset = offsetof(struct ieee80211_device,
- 						 spy_data);
- #endif
-+#endif
- 	net_dev->wireless_handlers = &ipw_wx_handler_def;
- 	net_dev->ethtool_ops = &ipw_ethtool_ops;
- 	net_dev->irq = pdev->irq;
diff --git a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
deleted file mode 100644
index 925f836485d3..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.1.ebuild,v 1.8 2005/07/11 16:47:50 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-FW_VERSION="2.2"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-
-IUSE="debug"
-DEPEND="!net-wireless/ieee80211
-		!net-wireless/ipw2100"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2200(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
-	epatch ${FILESDIR}/${P}-suspend2.patch
-
-	use debug && debug="y"
-	sed -i \
-		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
-		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
-		${S}/Makefile
-
-	if use_m; then
-		sed -i -e "s:\${SUBDIRS}:\${M}:" ${S}/Makefile
-	fi
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
deleted file mode 100644
index 9c5ab63ab0b5..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.5 2005/07/11 16:47:50 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-FW_VERSION="2.2"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-
-IUSE="debug"
-DEPEND="!net-wireless/ieee80211
-		!net-wireless/ipw2100"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2200(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-suspend2.patch
-	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
-
-	use debug && debug="y"
-	sed -i \
-		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
-		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
-		${S}/Makefile
-
-	if use_m; then
-		sed -i -e "s:\${SUBDIRS}:\${M}:" ${S}/Makefile
-	fi
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.4.ebuild b/net-wireless/ipw2200/ipw2200-1.0.4.ebuild
deleted file mode 100644
index 7d099f4a803b..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.4.ebuild,v 1.3 2005/07/11 16:47:50 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="debug"
-DEPEND="!net-wireless/ieee80211
-		!net-wireless/ipw2100"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-
-MODULE_NAMES="ipw2200(net:)
-			ieee80211(net:)
-			ieee80211_crypt(net:)
-			ieee80211_crypt_wep(net:)
-			ieee80211_crypt_ccmp(net:)
-			ieee80211_crypt_tkip(net:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC FW_LOADER CRC32"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
-ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
-
-pkg_setup() {
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if ! (linux_chkconfig_present CRYPTO_AES_586 || linux_chkconfig_present CRYPTO_AES); then
-		eerror "${P} requires support for AES cipher algorithms (i586) (CONFIG_CRYPTO_AES_586)."
-		eerror "This option is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
-		die "CONFIG_CRYPTO_AES_586 support not detected"
-	fi
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="KSRC=${KV_DIR}"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
-
-	use debug && debug="y"
-	sed -i \
-		-e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" \
-		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=$debug:" \
-		${S}/Makefile
-
-	if use_m; then
-		sed -i -e "s:\${SUBDIRS}:\${M}:" ${S}/Makefile
-	fi
-	convert_to_m ${S}/Makefile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.5.ebuild b/net-wireless/ipw2200/ipw2200-1.0.5.ebuild
deleted file mode 100644
index 2e58377707bc..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.5.ebuild,v 1.1 2005/07/12 21:51:49 brix Exp $
-
-inherit linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.0.1"
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="debug"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-}
-
-src_compile() {
-	einfo
-	einfo "You may safely ignore any errors from compilation that contain"
-	einfo "warnings about undefined references to the ieee80211 subsystem."
-	einfo
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.6-r1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.6-r1.ebuild
deleted file mode 100644
index 6902f165fb39..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.6-r1.ebuild,v 1.2 2005/08/29 20:06:26 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.0.2"
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-hwcrypt-wpa-fix4.patch
-	epatch ${FILESDIR}/${P}-suspend2.patch
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-}
-
-src_compile() {
-	einfo
-	einfo "You may safely ignore any errors from compilation that contain"
-	einfo "warnings about undefined references to the ieee80211 subsystem."
-	einfo
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild b/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild
deleted file mode 100644
index c0cb947978af..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild,v 1.1 2005/09/02 17:34:44 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.0.3-r1"
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-hwcrypt-wpa-fix4.patch
-	epatch ${FILESDIR}/${P}-suspend2.patch
-	epatch ${FILESDIR}/${P}-broadcast.patch
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-}
-
-src_compile() {
-	einfo
-	einfo "You may safely ignore any errors from compilation that contain"
-	einfo "warnings about undefined references to the ieee80211 subsystem."
-	einfo
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.6-r3.ebuild b/net-wireless/ipw2200/ipw2200-1.0.6-r3.ebuild
deleted file mode 100644
index 89634ce3eece..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.6-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.6-r3.ebuild,v 1.3 2005/10/15 20:53:15 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.0.3-r2"
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE="debug"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if [[ ! -f /lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
-		eerror
-		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
-		eerror "upgrading your kernel."
-		eerror
-		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
-		eerror "modules needs to be remerged after a kernel upgrade."
-		eerror
-		die "/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-a_txpow.patch
-	epatch ${FILESDIR}/${P}-channel_change_fw_err.patch
-	epatch ${FILESDIR}/${P}-dup-without-retry.patch
-	epatch ${FILESDIR}/${P}-hwcrypt-wpa-fix4.patch
-	epatch ${FILESDIR}/${P}-ibss-wep.patch
-	epatch ${FILESDIR}/${P}-init_scan.patch
-	epatch ${FILESDIR}/${P}-irq_override.patch
-	epatch ${FILESDIR}/${P}-monitor_wep_fix.patch
-	epatch ${FILESDIR}/${P}-open_frag.patch
-	epatch ${FILESDIR}/${P}-pci_link-fix.patch
-	epatch ${FILESDIR}/${P}-reset-mode-fix.patch
-
-	epatch ${FILESDIR}/${P}-broadcast.patch
-	kernel_is gt 2 6 12 && epatch ${FILESDIR}/${P}-suspend2.patch
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo
-	einfo "You may safely ignore any errors from above compilation that contain"
-	einfo "warnings about undefined references to the ieee80211 subsystem."
-	einfo
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.6.ebuild b/net-wireless/ipw2200/ipw2200-1.0.6.ebuild
deleted file mode 100644
index 0b1fc25fccde..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.6.ebuild,v 1.3 2005/08/16 12:33:44 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.0.2"
-FW_VERSION="2.3"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-IUSE="debug"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
-RDEPEND="${DEPEND}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n"
-
-	unpack ${A}
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-}
-
-src_compile() {
-	einfo
-	einfo "You may safely ignore any errors from compilation that contain"
-	einfo "warnings about undefined references to the ieee80211 subsystem."
-	einfo
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.7-r1.ebuild b/net-wireless/ipw2200/ipw2200-1.0.7-r1.ebuild
deleted file mode 100644
index 4fa0bc196170..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.7-r1.ebuild,v 1.1 2005/10/20 13:25:28 brix Exp $
-
-inherit eutils linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.1.5-r1"
-FW_VERSION="2.4"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug radiotap"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		sys-apps/sed"
-RDEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER !IPW2200"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_IPW2200="${P} requires the in-kernel version of the IPW2200 driver to be disabled (CONFIG_IPW2200)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if [[ ! -f /lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
-		eerror
-		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
-		eerror "upgrading your kernel."
-		eerror
-		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
-		eerror "modules needs to be remerged after a kernel upgrade."
-		eerror
-		die "/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n" radiotap="n"
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-broadcast.patch
-	epatch ${FILESDIR}/${P}-wireless_ext-capa.patch
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-
-
-	use radiotap && radiotap="y"
-	sed -i -e "s:^#\(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=${radiotap}:" ${S}/Makefile || die
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo
-	einfo "You may safely ignore any warnings from above compilation about"
-	einfo "undefined references to the ieee80211 subsystem."
-	einfo
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.7.ebuild b/net-wireless/ipw2200/ipw2200-1.0.7.ebuild
deleted file mode 100644
index 047c5506f256..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.7.ebuild,v 1.1 2005/10/18 18:26:12 brix Exp $
-
-inherit linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.1.5"
-FW_VERSION="2.4"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug radiotap"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		sys-apps/sed"
-RDEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER !IPW2200"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_IPW2200="${P} requires the in-kernel version of the IPW2200 driver to be disabled (CONFIG_IPW2200)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if [[ ! -f /lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
-		eerror
-		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
-		eerror "upgrading your kernel."
-		eerror
-		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
-		eerror "modules needs to be remerged after a kernel upgrade."
-		eerror
-		die "/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n" radiotap="n"
-
-	unpack ${A}
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-
-
-	use radiotap && radiotap="y"
-	sed -i -e "s:^#\(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=${radiotap}:" ${S}/Makefile || die
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo
-	einfo "You may safely ignore any warnings from above compilation about"
-	einfo "undefined references to the ieee80211 subsystem."
-	einfo
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}
diff --git a/net-wireless/ipw2200/ipw2200-1.0.8.ebuild b/net-wireless/ipw2200/ipw2200-1.0.8.ebuild
deleted file mode 100644
index c0db2be33edb..000000000000
--- a/net-wireless/ipw2200/ipw2200-1.0.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.8.ebuild,v 1.1 2005/10/21 18:14:16 brix Exp $
-
-inherit linux-mod
-
-# The following works with both pre-releases and releases
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-
-IEEE80211_VERSION="1.1.6"
-FW_VERSION="2.4"
-
-DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
-HOMEPAGE="http://ipw2200.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug radiotap"
-DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		sys-apps/sed"
-RDEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}
-		=net-wireless/ipw2200-firmware-${FW_VERSION}
-		net-wireless/wireless-tools"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="ipw2200(net/wireless:)"
-MODULESD_IPW2200_DOCS="README.ipw2200"
-
-CONFIG_CHECK="NET_RADIO FW_LOADER !IPW2200"
-ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
-ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
-ERROR_IPW2200="${P} requires the in-kernel version of the IPW2200 driver to be disabled (CONFIG_IPW2200)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	if kernel_is 2 4; then
-		die "${P} does not support building against kernel 2.4.x"
-	fi
-
-	if [[ ! -f /lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} ]]; then
-		eerror
-		eerror "Looks like you forgot to remerge net-wireless/ieee80211 after"
-		eerror "upgrading your kernel."
-		eerror
-		eerror "Hint: use sys-kernel/module-rebuild for keeping track of which"
-		eerror "modules needs to be remerged after a kernel upgrade."
-		eerror
-		die "/lib/modules/${KV_FULL}/net/ieee80211/ieee80211.${KV_OBJ} not found"
-	fi
-
-	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
-}
-
-src_unpack() {
-	local debug="n" radiotap="n"
-
-	unpack ${A}
-
-	use debug && debug="y"
-	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
-
-
-	use radiotap && radiotap="y"
-	sed -i -e "s:^#\(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=${radiotap}:" ${S}/Makefile || die
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo
-	einfo "You may safely ignore any warnings from above compilation about"
-	einfo "undefined references to the ieee80211 subsystem."
-	einfo
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc CHANGES ISSUES
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
-		einfo
-		einfo "Modules from an earlier installation detected. You will need to manually"
-		einfo "remove those modules by running the following commands:"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
-		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
-		einfo "  # depmod -a"
-		einfo
-	fi
-}