Fix for newer kernels thanks to many people in bug 160058

(Portage version: 2.1.2.7)

4 files changed, 192 insertions, 4 deletions

diff --git a/net-wireless/rtl8180/ChangeLog b/net-wireless/rtl8180/ChangeLog
index 2b9917e457f9..fbab53648a03 100644
--- a/net-wireless/rtl8180/ChangeLog
+++ b/net-wireless/rtl8180/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/rtl8180
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/ChangeLog,v 1.10 2006/06/25 17:19:45 genstef Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/ChangeLog,v 1.11 2007/05/09 20:15:51 genstef Exp $
+
+  09 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/rtl8180-2.6.19.patch, +files/rtl8180-2.6.20.patch,
+  rtl8180-0.22_pre20050528.ebuild:
+  Fix for newer kernels thanks to many people in bug 160058
 
   25 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
   -files/rtl8180-pci_name.patch, -files/rtl8180_gcc4_fix.patch,
diff --git a/net-wireless/rtl8180/files/rtl8180-2.6.19.patch b/net-wireless/rtl8180/files/rtl8180-2.6.19.patch
new file mode 100644
index 000000000000..ccb89721d521
--- /dev/null
+++ b/net-wireless/rtl8180/files/rtl8180-2.6.19.patch
@@ -0,0 +1,145 @@
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c rtl8180-0.22_pre20050528/ieee80211_crypt.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_crypt.c	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/ieee80211_crypt.c	2006-12-25 11:31:18.000000000 +0100
+@@ -11,8 +11,12 @@
+  *
+  */
+ #ifndef CONFIG_IEEE80211_NOWEP
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++	#include <linux/config.h>
++#else
++	#include <linux/autoconf.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c	2006-12-25 11:31:18.000000000 +0100
+@@ -12,8 +12,12 @@
+  * someoneelse-
+  */
+ #ifndef CONFIG_IEEE80211_NOWEP
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++        #include <linux/config.h>
++#else
++        #include <linux/autoconf.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_module.c rtl8180-0.22_pre20050528/ieee80211_module.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_module.c	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/ieee80211_module.c	2006-12-25 11:31:18.000000000 +0100
+@@ -38,7 +38,12 @@
+ *******************************************************************************/
+ #include <linux/init.h>
+ #include <linux/compiler.h>
+-#include <linux/config.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++        #include <linux/config.h>
++#else
++        #include <linux/autoconf.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -53,7 +58,6 @@
+ #include <linux/slab.h>
+ #include <linux/tcp.h>
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/wireless.h>
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_rx.c rtl8180-0.22_pre20050528/ieee80211_rx.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_rx.c	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/ieee80211_rx.c	2006-12-25 11:31:18.000000000 +0100
+@@ -17,7 +17,12 @@
+  */
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++        #include <linux/config.h>
++#else
++        #include <linux/autoconf.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -32,7 +37,6 @@
+ #include <linux/slab.h>
+ #include <linux/tcp.h>
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/wireless.h>
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_tx.c rtl8180-0.22_pre20050528/ieee80211_tx.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_tx.c	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/ieee80211_tx.c	2006-12-25 11:31:18.000000000 +0100
+@@ -31,7 +31,12 @@
+ 
+ ******************************************************************************/
+ #include <linux/compiler.h>
+-#include <linux/config.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++        #include <linux/config.h>
++#else
++        #include <linux/autoconf.h>
++#endif
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -46,7 +51,6 @@
+ #include <linux/slab.h>
+ #include <linux/tcp.h>
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/wireless.h>
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+diff -Nurp rtl8180-0.22_pre20050528.orig/r8180_core.c rtl8180-0.22_pre20050528/r8180_core.c
+--- rtl8180-0.22_pre20050528.orig/r8180_core.c	2006-12-25 11:20:09.000000000 +0100
++++ rtl8180-0.22_pre20050528/r8180_core.c	2006-12-25 11:32:04.000000000 +0100
+@@ -4038,7 +4038,14 @@ static int __devinit rtl8180_pci_probe(s
+ 	dev->do_ioctl = do_ioctl;
+ 	dev->set_multicast_list = r8180_set_multicast;
+ 	dev->set_mac_address = r8180_set_mac_adr;
+-	dev->get_wireless_stats = r8180_get_wireless_stats;
++
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 17
++        dev->get_wireless_stats = r8180_get_wireless_stats;
++#endif
++        dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
++#endif
++
+ 	dev->type=ARPHRD_ETHER;
+ 	
+ 	if (dev_alloc_name(dev, ifname) < 0){
+diff -Nurp rtl8180-0.22_pre20050528.orig/r8180.h rtl8180-0.22_pre20050528/r8180.h
+--- rtl8180-0.22_pre20050528.orig/r8180.h	2006-02-15 21:52:10.000000000 +0100
++++ rtl8180-0.22_pre20050528/r8180.h	2006-12-25 11:31:18.000000000 +0100
+@@ -26,7 +26,12 @@
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/config.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++        #include <linux/config.h>
++#else
++        #include <linux/autoconf.h>
++#endif
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
diff --git a/net-wireless/rtl8180/files/rtl8180-2.6.20.patch b/net-wireless/rtl8180/files/rtl8180-2.6.20.patch
new file mode 100644
index 000000000000..62de29090022
--- /dev/null
+++ b/net-wireless/rtl8180/files/rtl8180-2.6.20.patch
@@ -0,0 +1,32 @@
+Files rtl8180-0.22_pre20050528.orig/ieee80211_crypt.o and rtl8180-0.22_pre20050528/ieee80211_crypt.o differ
+diff -Nurp rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c
+--- rtl8180-0.22_pre20050528.orig/ieee80211_crypt_wep.c	2007-02-08 23:39:39.000000000 +0000
++++ rtl8180-0.22_pre20050528/ieee80211_crypt_wep.c	2007-02-08 23:42:48.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <linux/slab.h>
+ #include <linux/random.h>
+ #include <linux/skbuff.h>
++#include <linux/mm.h>
+ #include <asm/string.h>
+ 
+ #include "ieee80211.h"
+Files rtl8180-0.22_pre20050528.orig/ieee80211_module.o and rtl8180-0.22_pre20050528/ieee80211_module.o differ
+Files rtl8180-0.22_pre20050528.orig/ieee80211_rx.o and rtl8180-0.22_pre20050528/ieee80211_rx.o differ
+Files rtl8180-0.22_pre20050528.orig/ieee80211_tx.o and rtl8180-0.22_pre20050528/ieee80211_tx.o differ
+Files rtl8180-0.22_pre20050528.orig/ieee80211_wx.o and rtl8180-0.22_pre20050528/ieee80211_wx.o differ
+diff -Nurp rtl8180-0.22_pre20050528.orig/r8180_core.c rtl8180-0.22_pre20050528/r8180_core.c
+--- rtl8180-0.22_pre20050528.orig/r8180_core.c	2007-02-08 23:39:39.000000000 +0000
++++ rtl8180-0.22_pre20050528/r8180_core.c	2007-02-08 23:42:25.000000000 +0000
+@@ -2838,8 +2838,11 @@ short rtl8180_init(struct net_device *de
+ 	priv->workqueue = create_workqueue(DRV_NAME);
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->IBSS_work,(void(*)(void*)) rtl8180_IBSS_create_wq,dev);
+-	
++#else
++	INIT_WORK(&priv->IBSS_work,dev);
++#endif	
+ 	tasklet_init(&priv->irq_rx_tasklet,
+ 		     (void(*)(unsigned long)) rtl8180_irq_rx_tasklet,
+ 		     (unsigned long)priv);
diff --git a/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild b/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild
index 1292960a65d7..f6371bb33f4a 100644
--- a/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild
+++ b/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild,v 1.3 2006/06/25 17:19:44 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl8180/rtl8180-0.22_pre20050528.ebuild,v 1.4 2007/05/09 20:15:51 genstef Exp $
 
 inherit linux-mod eutils
 
@@ -30,6 +30,12 @@ src_unpack() {
 	sed -i -e 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' \
 		-e 's:MODULE_PARM(\([^,]*\),"s");:module_param(\1, charp, 0);:' r8180_core.c
 	sed -i -e 's:MODVERDIR=$(PWD) ::' {,ieee80211/}Makefile
+
+	# 2.6.19 patch
+	epatch ${FILESDIR}/${PN}-2.6.19.patch
+
+	# 2.6.20 patch
+	epatch ${FILESDIR}/${PN}-2.6.20.patch
 }
 
 src_install() {