[patch] patch for compilation with 2.6.33 kernel

ndiswrapper-1.55-2.6.33.patch (text/plain), 2.45 KB, created by Octavian on 2010-01-12 21:39:22 UTC

diff -urN ndiswrapper-1.55/driver/Makefile ndiswrapper-1.55-new/driver/Makefile
--- ndiswrapper-1.55/driver/Makefile	2009-06-29 04:09:27.000000000 +0200
+++ ndiswrapper-1.55-new/driver/Makefile	2010-01-12 16:41:48.000000000 +0100
@@ -171,7 +171,7 @@
 		echo; echo; \
 		exit 1; \
 	fi
-	@if [ -z "$(CONFIG_WIRELESS_EXT)$(CONFIG_NET_RADIO)" ]; then \
+	@if [ -z "$(CONFIG_CFG80211_WEXT)$(CONFIG_NET_RADIO)" ]; then \
 		echo; echo; \
 		echo "*** WARNING: This kernel lacks wireless extensions."; \
 		echo "Wireless drivers will not work properly."; \
diff -urN ndiswrapper-1.55/driver/ndis.c ndiswrapper-1.55-new/driver/ndis.c
--- ndiswrapper-1.55/driver/ndis.c	2009-06-29 04:09:27.000000000 +0200
+++ ndiswrapper-1.55-new/driver/ndis.c	2010-01-12 16:41:20.000000000 +0100
@@ -2027,7 +2027,7 @@
 		switch (si->status_type) {
 		case Ndis802_11StatusType_MediaStreamMode:
 			break;
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
 		case Ndis802_11StatusType_Authentication:
 			buf = (char *)buf + sizeof(*si);
 			len -= sizeof(*si);
diff -urN ndiswrapper-1.55/driver/ntoskernel.h ndiswrapper-1.55-new/driver/ntoskernel.h
--- ndiswrapper-1.55/driver/ntoskernel.h	2009-06-29 04:09:27.000000000 +0200
+++ ndiswrapper-1.55-new/driver/ntoskernel.h	2010-01-12 16:41:28.000000000 +0100
@@ -82,8 +82,8 @@
 #define PCI_DMA_MAP_ERROR(dma_addr) dma_mapping_error(dma_addr)
 
 
-#if defined(CONFIG_NET_RADIO) && !defined(CONFIG_WIRELESS_EXT)
-#define CONFIG_WIRELESS_EXT
+#if defined(CONFIG_NET_RADIO) && !defined(CONFIG_CFG80211_WEXT)
+#define CONFIG_CFG80211_WEXT
 #endif
 
 #define prepare_wait_condition(task, var, value)	\
diff -urN ndiswrapper-1.55/driver/wrapndis.c ndiswrapper-1.55-new/driver/wrapndis.c
--- ndiswrapper-1.55/driver/wrapndis.c	2009-06-29 04:09:27.000000000 +0200
+++ ndiswrapper-1.55-new/driver/wrapndis.c	2010-01-12 16:41:53.000000000 +0100
@@ -988,7 +988,7 @@
 
 static void link_status_off(struct ndis_device *wnd)
 {
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
 	union iwreq_data wrqu;
 
 	memset(&wrqu, 0, sizeof(wrqu));
@@ -1000,7 +1000,7 @@
 
 static void link_status_on(struct ndis_device *wnd)
 {
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
 	struct ndis_assoc_info *ndis_assoc_info;
 	union iwreq_data wrqu;
 	NDIS_STATUS res;
@@ -1008,7 +1008,7 @@
 #endif
 
 	ENTER2("");
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
 	memset(&wrqu, 0, sizeof(wrqu));
 	ndis_assoc_info = kzalloc(assoc_size, GFP_KERNEL);
 	if (!ndis_assoc_info) {