X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-wireless;h=71f3bc9f31d510b070e3e8fcd28d6f6c1ba0b4ac;hb=65248b97be7ba645f45b8dc05f0294a680193c19;hp=44f0fe9a1ea4c36e21b3cf0ed495fe896e4dccd9;hpb=31e0e08a59b58622a6ad0b803a589427d01c0f30;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 44f0fe9a1e..71f3bc9f31 100644
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,17 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
 ifeq "$(XEN)" "1"
 	VERSUFIX=ipfire-xen
 else
 	VERSUFIX=ipfire
 endif
+endif
 
-VER        = 2.6.34.1
+VER        = 2.6.39-1-sn
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -42,11 +46,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
+$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
+asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
 
@@ -77,10 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
-	# Enable some USB ID's in rt2800usb driver
-	echo "CONFIG_RT2800USB_RT30XX=y"  >> $(DIR_APP)/config.mk
-	echo "CONFIG_RT2800USB_RT35XX=y"  >> $(DIR_APP)/config.mk
-	echo "CONFIG_RT2800USB_UNKNOWN=y" >> $(DIR_APP)/config.mk
+	# kfifo has no license info and taints kernel
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
 
 	# Copy USB-Net drivers from Kernel...
 	mkdir $(DIR_APP)/drivers/net/usb/new
@@ -90,6 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
+	# Build Updated asix usb-lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
+
 	cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
 		KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules