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>