[Madwifi-cvs] revision 1212 committed by br1

[br1 <svn...@ma...>]

Project     : madwifi
Revision    : 1212
Author      : br1
Date        : 2005-10-28 12:38:59 +0200 (Fri, 28 Oct 2005)

Log Message :
Checking WIRELESS_EXT in the Makefile relies on knowing the path to the
kernel sources, as opposed to the kernel build tree.  It would stand in
the way of adding support for kernel builds outside the source tree.

It's much easier to check WIRELESS_EXT by the compiler than to parse a C
header in the Makefile.

Signed-off-by: Pavel Roskin <pr...@gn...>

Affected Files:
* trunk/Makefile                                      updated             
* trunk/Makefile.inc                                  updated             
* trunk/net80211/ieee80211_wireless.c                 updated             


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-10-28 10:35:47 UTC (rev 1211)
+++ trunk/Makefile	2005-10-28 10:38:59 UTC (rev 1212)
@@ -100,7 +100,6 @@
 	    echo "DESTDIR      : $(DESTDIR)"; \
 	    echo "SYSTEMMAP    : $(SYSTEMMAP)"; \
 	fi
-	@echo "WIRELESSEXT  : $(WIRELESSEXT)"
 
 dotconfig:
 	@#
@@ -126,13 +125,6 @@
 	    exit 1; \
 	}
 	
-	@if [ "$(WIRELESSEXT)" -lt 14 ]; then \
-	    echo "FAILED"; \
-	    echo "Wireless extensions v14 or better is needed."; \
-	    echo "You have v$(WIRELESSEXT)."; \
-	    exit 1; \
-	fi
-	
 	@# check kernel configuration
 	@if [ -z "$(CONFIG_SYSCTL)" ]; then \
 	    echo "FAILED"; \

Modified: trunk/Makefile.inc
===================================================================
--- trunk/Makefile.inc	2005-10-28 10:35:47 UTC (rev 1211)
+++ trunk/Makefile.inc	2005-10-28 10:38:59 UTC (rev 1212)
@@ -130,10 +130,6 @@
 MODULEPATH ?=	/lib/modules/${KERNELRELEASE}/net
 endif
 
-# WIRELESSEXT contains information about the version of the wireless
-# extensions that are available in the target kernel
-WIRELESSEXT ?=	$(shell cat $(KERNELPATH)/include/linux/wireless.h | grep "\#define WIRELESS_EXT" | cut -f2)
-
 # Some settings that depend on actual kernel release
 ifneq ($(findstring 2.6,$(KERNELRELEASE)),)
 export-objs	:=

Modified: trunk/net80211/ieee80211_wireless.c
===================================================================
--- trunk/net80211/ieee80211_wireless.c	2005-10-28 10:35:47 UTC (rev 1211)
+++ trunk/net80211/ieee80211_wireless.c	2005-10-28 10:38:59 UTC (rev 1212)
@@ -49,6 +49,10 @@
 #include <linux/if_arp.h>		/* XXX for ARPHRD_ETHER */
 #include <net/iw_handler.h>
 
+#if WIRELESS_EXT < 14
+#error "Wireless extensions v14 or better is needed."
+#endif
+
 #include <asm/uaccess.h>
 
 #include "if_media.h"