diff -ur rtl8187se_linux_26.1022.0904.2008.orig/ieee80211/ieee80211_wx.c rtl8187se_linux_26.1022.0904.2008/ieee80211/ieee80211_wx.c
--- rtl8187se_linux_26.1022.0904.2008.orig/ieee80211/ieee80211_wx.c	2008-09-04 19:17:23.000000000 +0200
+++ rtl8187se_linux_26.1022.0904.2008/ieee80211/ieee80211_wx.c	2008-09-30 19:18:43.000000000 +0200
@@ -42,7 +42,8 @@
 #define MAX_CUSTOM_LEN 64
 static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
  					   char *start, char *stop,
-					   struct ieee80211_network *network)
+					   struct ieee80211_network *network,
+					   struct iw_request_info *info)
 {
 	char custom[MAX_CUSTOM_LEN];
 	char *p;
@@ -54,7 +55,7 @@
 	iwe.cmd = SIOCGIWAP;
 	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
 	memcpy(iwe.u.ap_addr.sa_data, network->bssid, ETH_ALEN);
-	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_ADDR_LEN);
+	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN);
 
 	/* Remaining entries will be displayed in the order we provide them */
 
@@ -66,16 +67,16 @@
 	if (network->ssid_len == 0) {
 	//YJ,modified,080903,end
 		iwe.u.data.length = sizeof("<hidden>");
-		start = iwe_stream_add_point(start, stop, &iwe, "<hidden>");
+		start = iwe_stream_add_point(info, start, stop, &iwe, "<hidden>");
 	} else {
 		iwe.u.data.length = min(network->ssid_len, (u8)32);
-		start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
+		start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
 	}
 	//printk("ESSID: %s\n",network->ssid);
 	/* Add the protocol name */
 	iwe.cmd = SIOCGIWNAME;
 	snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]);
-	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
+	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
 
         /* Add mode */
         iwe.cmd = SIOCGIWMODE;
@@ -86,7 +87,7 @@
 		else
 			iwe.u.mode = IW_MODE_ADHOC;
 
-		start = iwe_stream_add_event(start, stop, &iwe,
+		start = iwe_stream_add_event(info, start, stop, &iwe,
 					     IW_EV_UINT_LEN);
 	}
 
@@ -97,7 +98,7 @@
 	iwe.u.freq.m = network->channel;
 	iwe.u.freq.e = 0;
 	iwe.u.freq.i = 0;
-	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
+	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN);
 
 	/* Add encryption capability */
 	iwe.cmd = SIOCGIWENCODE;
@@ -106,7 +107,7 @@
 	else
 		iwe.u.data.flags = IW_ENCODE_DISABLED;
 	iwe.u.data.length = 0;
-	start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
+	start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid);
 
 	/* Add basic and extended rates */
 	max_rate = 0;
@@ -135,13 +136,13 @@
 	iwe.cmd = SIOCGIWRATE;
 	iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
 	iwe.u.bitrate.value = max_rate * 500000;
-	start = iwe_stream_add_event(start, stop, &iwe,
+	start = iwe_stream_add_event(info, start, stop, &iwe,
 				     IW_EV_PARAM_LEN);
 
 	iwe.cmd = IWEVCUSTOM;
 	iwe.u.data.length = p - custom;
 	if (iwe.u.data.length)
-		start = iwe_stream_add_point(start, stop, &iwe, custom);
+		start = iwe_stream_add_point(info, start, stop, &iwe, custom);
 
 	/* Add quality statistics */
 	/* TODO: Fix these values... */
@@ -160,14 +161,14 @@
 	if (!(network->stats.mask & IEEE80211_STATMASK_SIGNAL))
 		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID;
 	iwe.u.qual.updated = 7;
-	start = iwe_stream_add_event(start, stop, &iwe, IW_EV_QUAL_LEN);
+	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
 
 	iwe.cmd = IWEVCUSTOM;
 	p = custom;
 
 	iwe.u.data.length = p - custom;
 	if (iwe.u.data.length)
-		start = iwe_stream_add_point(start, stop, &iwe, custom);
+		start = iwe_stream_add_point(info, start, stop, &iwe, custom);
 
 #if 0
 	if (ieee->wpa_enabled && network->wpa_ie_len){
@@ -182,7 +183,7 @@
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = IWEVCUSTOM;
 		iwe.u.data.length = strlen(buf);
-		start = iwe_stream_add_point(start, stop, &iwe, buf);
+		start = iwe_stream_add_point(info, start, stop, &iwe, buf);
 	}
 
 	if (ieee->wpa_enabled && network->rsn_ie_len){
@@ -203,7 +204,7 @@
                 memcpy(buf, network->wpa_ie, network->wpa_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = network->wpa_ie_len;
-                start = iwe_stream_add_point(start, stop, &iwe, buf);
+                start = iwe_stream_add_point(info, start, stop, &iwe, buf);
         }
 
         memset(&iwe, 0, sizeof(iwe));
@@ -221,7 +222,7 @@
                 memcpy(buf, network->rsn_ie, network->rsn_ie_len);
                 iwe.cmd = IWEVGENIE;
                 iwe.u.data.length = network->rsn_ie_len;
-		start = iwe_stream_add_point(start, stop, &iwe, buf);
+		start = iwe_stream_add_point(info, start, stop, &iwe, buf);
 	}
 
 #endif
@@ -234,7 +235,7 @@
 		      " Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100));
 	iwe.u.data.length = p - custom;
 	if (iwe.u.data.length)
-		start = iwe_stream_add_point(start, stop, &iwe, custom);
+		start = iwe_stream_add_point(info, start, stop, &iwe, custom);
 
 
 	return start;
@@ -269,7 +270,7 @@
 			if (ieee->scan_age == 0 ||
 			    time_after(network->last_scanned + ieee->scan_age, jiffies))
 			{
-				ev = ipw2100_translate_scan(ieee, ev, stop, network);
+				ev = ipw2100_translate_scan(ieee, ev, stop, network, info);
 			}
 			else
 				IEEE80211_DEBUG_SCAN(
diff -ur rtl8187se_linux_26.1022.0904.2008.orig/makedrv rtl8187se_linux_26.1022.0904.2008/makedrv
--- rtl8187se_linux_26.1022.0904.2008.orig/makedrv	2008-09-04 19:17:23.000000000 +0200
+++ rtl8187se_linux_26.1022.0904.2008/makedrv	2008-09-30 19:18:46.000000000 +0200
@@ -5,6 +5,7 @@
 cd ieee80211
 make clean
 make
+cp Module.symvers ../rtl8185/ # dirty hack
 cd ../rtl8185
 make clean
 make
diff -ur rtl8187se_linux_26.1022.0904.2008.orig/rtl8185/r8180_core.c rtl8187se_linux_26.1022.0904.2008/rtl8185/r8180_core.c
--- rtl8187se_linux_26.1022.0904.2008.orig/rtl8185/r8180_core.c	2008-09-04 19:17:23.000000000 +0200
+++ rtl8187se_linux_26.1022.0904.2008/rtl8185/r8180_core.c	2008-09-30 19:18:37.000000000 +0200
@@ -6742,7 +6742,7 @@
 
 static u8 read_acadapter_file(char *filename)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21))
+#if 0
 	int fd;
 	char buf[1];
 	char ret[50];
diff -ur rtl8187se_linux_26.1022.0904.2008.orig/rtl8185/r8180.h rtl8187se_linux_26.1022.0904.2008/rtl8185/r8180.h
--- rtl8187se_linux_26.1022.0904.2008.orig/rtl8185/r8180.h	2008-09-04 19:17:23.000000000 +0200
+++ rtl8187se_linux_26.1022.0904.2008/rtl8185/r8180.h	2008-09-30 19:18:40.000000000 +0200
@@ -43,7 +43,7 @@
 #include <linux/if_arp.h>
 #include "ieee80211.h"
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define EPROM_93c46 0
 #define EPROM_93c56 1