Updated fix for older kernels.

(Portage version: 2.0.53)

4 files changed, 77 insertions, 36 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 90539797cdb7..bb9f53ade23a 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.88 2006/01/11 12:30:47 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.89 2006/01/12 12:17:52 brix Exp $
+
+  12 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -files/ipw2100-1.1.4-old_kernel_fix.patch,
+  +files/ipw2100-1.1.4-old_kernel_fix2.patch, ipw2100-1.1.4.ebuild:
+  Updated fix for older kernels.
 
   11 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
   +files/ipw2100-1.1.4-old_kernel_fix.patch, ipw2100-1.1.4.ebuild:
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix.patch b/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix.patch
deleted file mode 100644
index d3eb90c7397f..000000000000
--- a/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urp ipw2100-1.1.4/ipw2100.c ipw2100-1.1.4-fix/ipw2100.c
---- ipw2100-1.1.4/ipw2100.c	2006-01-11 13:39:51.000000000 +0800
-+++ ipw2100-1.1.4-fix/ipw2100.c	2006-01-11 13:39:47.000000000 +0800
-@@ -296,16 +296,6 @@ static const char *command_types[] = {
- };
- #endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
--static void *kzalloc(size_t size, gfp_t flags)
--{
--	void *ret = kmalloc(size, flags);
--	if (ret)
--		memset(ret, 0, size);
--	return ret;
--}
--#endif
--
- /* Pre-decl until we get the code solid and then we can clean it up */
- static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
- static void ipw2100_tx_send_data(struct ipw2100_priv *priv);
-@@ -6440,8 +6430,12 @@ static struct net_device *ipw2100_alloc_
- 	dev->ethtool_ops = &ipw2100_ethtool_ops;
- 	dev->tx_timeout = ipw2100_tx_timeout;
- 	dev->wireless_handlers = &ipw2100_wx_handler_def;
-+#if IW_HANDLER_VERSION > 6
- 	priv->wireless_data.ieee80211 = priv->ieee;
- 	dev->wireless_data = &priv->wireless_data;
-+#else
-+	dev->get_wireless_stats = ipw2100_wx_wireless_stats;
-+#endif
- 	dev->set_mac_address = ipw2100_set_address;
- 	dev->watchdog_timeo = 3 * HZ;
- 	dev->irq = 0;
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix2.patch b/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix2.patch
new file mode 100644
index 000000000000..b5929f934b1a
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.4-old_kernel_fix2.patch
@@ -0,0 +1,69 @@
+diff -urp ipw2100-1.1.4/ipw2100.c ipw2100-1.1.4-fix/ipw2100.c
+--- ipw2100-1.1.4/ipw2100.c	2006-01-09 14:30:55.000000000 +0800
++++ ipw2100-1.1.4-fix/ipw2100.c	2006-01-12 18:11:15.259145736 +0800
+@@ -296,16 +296,6 @@ static const char *command_types[] = {
+ };
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+-static void *kzalloc(size_t size, gfp_t flags)
+-{
+-	void *ret = kmalloc(size, flags);
+-	if (ret)
+-		memset(ret, 0, size);
+-	return ret;
+-}
+-#endif
+-
+ /* Pre-decl until we get the code solid and then we can clean it up */
+ static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
+ static void ipw2100_tx_send_data(struct ipw2100_priv *priv);
+@@ -6440,8 +6430,12 @@ static struct net_device *ipw2100_alloc_
+ 	dev->ethtool_ops = &ipw2100_ethtool_ops;
+ 	dev->tx_timeout = ipw2100_tx_timeout;
+ 	dev->wireless_handlers = &ipw2100_wx_handler_def;
++#if IW_HANDLER_VERSION > 6
+ 	priv->wireless_data.ieee80211 = priv->ieee;
+ 	dev->wireless_data = &priv->wireless_data;
++#else
++	dev->get_wireless_stats = ipw2100_wx_wireless_stats;
++#endif
+ 	dev->set_mac_address = ipw2100_set_address;
+ 	dev->watchdog_timeo = 3 * HZ;
+ 	dev->irq = 0;
+@@ -7303,10 +7297,12 @@ static int ipw2100_wx_get_range(struct n
+ 	}
+ 	range->num_frequency = val;
+ 
++#if WIRELESS_EXT >= 17
+ 	/* Event capability (kernel + driver) */
+ 	range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
+ 				IW_EVENT_CAPA_MASK(SIOCGIWAP));
+ 	range->event_capa[1] = IW_EVENT_CAPA_K_1;
++#endif
+ 
+ 	IPW_DEBUG_WX("GET Range\n");
+ 
+@@ -8725,7 +8721,9 @@ static struct iw_handler_def ipw2100_wx_
+ 	    sizeof(struct iw_priv_args),
+ 	.private = (iw_handler *) ipw2100_private_handler,
+ 	.private_args = (struct iw_priv_args *)ipw2100_private_args,
++#if WIRELESS_EXT >= 17
+ 	.get_wireless_stats = ipw2100_wx_wireless_stats,
++#endif
+ };
+ 
+ static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
+diff -urp ipw2100-1.1.4/ipw2100.h ipw2100-1.1.4-fix/ipw2100.h
+--- ipw2100-1.1.4/ipw2100.h	2006-01-09 14:30:55.000000000 +0800
++++ ipw2100-1.1.4-fix/ipw2100.h	2006-01-12 18:11:15.289141176 +0800
+@@ -574,7 +574,9 @@ struct ipw2100_priv {
+ 	struct net_device *net_dev;
+ 	struct iw_statistics wstats;
+ 
++#if IW_HANDLER_VERSION > 6
+ 	struct iw_public_data wireless_data;
++#endif
+ 
+ 	struct tasklet_struct irq_tasklet;
+ 
diff --git a/net-wireless/ipw2100/ipw2100-1.1.4.ebuild b/net-wireless/ipw2100/ipw2100-1.1.4.ebuild
index 9b8539da4439..0d39217a22ee 100644
--- a/net-wireless/ipw2100/ipw2100-1.1.4.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.4.ebuild,v 1.2 2006/01/11 12:30:47 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.4.ebuild,v 1.3 2006/01/12 12:17:52 brix Exp $
 
 inherit eutils linux-mod
 
@@ -61,7 +61,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-old_kernel_fix.patch
+	epatch ${FILESDIR}/${P}-old_kernel_fix2.patch
 
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=$debug:" ${S}/Makefile