X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcompat-drivers;h=57a9b163ffc5d843a91821d9b89bdefe9ac11ec8;hb=bf5e1c4c52828c48d6c51b6830f9d696be261877;hp=b950d454dddd510ddc9ea38ba9e39332b553f4fb;hpb=1b9282639696921f60fc73a1c2d7a73d4b336fe5;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/compat-drivers b/lfs/compat-drivers
index b950d454d..57a9b163f 100644
--- a/lfs/compat-drivers
+++ b/lfs/compat-drivers
@@ -26,14 +26,14 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.8-1-u
+VER        = 3.8.3-2-snpu
 
 ifeq "$(KCFG)" "-xen"
-	KVER = 2.6.32.60
+	KVER = 2.6.32.61
 endif
 
 THISAPP    = compat-drivers-$(VER)
-DL_FILE    = compat-drivers-$(VER).tar.xz
+DL_FILE    = compat-drivers-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -42,13 +42,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) asix-4.5.0a.tar.xz
+objects = $(DL_FILE) asix-4.7.0a.tar.xz asix_gb-1.4.0a.tar.xz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asix-4.5.0a.tar.xz = $(DL_FROM)/asix-4.5.0a.tar.xz
+asix-4.7.0a.tar.xz = $(DL_FROM)/asix-4.7.0a.tar.xz
+asix_gb-1.4.0a.tar.xz = $(DL_FROM)/asix_gb-1.4.0a.tar.xz
 
-$(DL_FILE)_MD5 = 557e3099c642455ec272d9ddf46de484
-asix-4.5.0a.tar.xz_MD5=4219ce7c0cae4fdb580f30ea50cad8e0
+$(DL_FILE)_MD5 = 5a1e27e5b694aa5022116a5a3220bfdc
+asix-4.7.0a.tar.xz_MD5=491f7e8c3ee74433975812d86a0fa98b
+asix_gb-1.4.0a.tar.xz_MD5=9c9db731631abf00da2069d03253f9a7
 
 install : $(TARGET)
 
@@ -78,6 +80,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8-1-u-kref_get_unless_zero.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
 
 	# 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
@@ -96,8 +100,13 @@ $(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 xvJf $(DIR_DL)/asix-4.5.0a.tar.xz
+	# Build Updated asix usb lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.7.0a.tar.xz
+
+	# Build Updated asix usb gigabit lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix_gb-1.4.0a.tar.xz
+	echo 'obj-$$(CONFIG_USB_ASIX_GB) += asix_gb.o' >> $(DIR_APP)/drivers/net/usb/Makefile
+	cd $(DIR_APP) && echo export CONFIG_USB_ASIX_GB=m >> config.mk
 
 	# Add libartas uAP driver
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch
@@ -111,9 +120,6 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	# disable video because it not build on Arm
 	cd $(DIR_APP) && sed -i -e \
 		"s/export CONFIG_COMPAT_VIDEO_MODULES=y//g" config.mk
-
-	# Add a missing vmalloc ti atx
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8-arm_missing_vmalloc.patch
 endif
 
 	# Erase some modules that are obsolete or moved to other path