X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fr8169;h=b738385361f5e1b1ec1eb15407c8a66e3503b85e;hp=a43bdae766574636cd97e25515304d07c0624ca9;hb=ec238128df8a41644501c9620c03103e93c89afd;hpb=73ebc129888cd2ffdb9f1ecd3fd25971b04595ea

diff --git a/lfs/r8169 b/lfs/r8169
index a43bdae766..b738385361 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        = 6.011.00
+VER        = 6.014.00
 
 THISAPP    = r8169-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c5e3ab4e6257cb63d46dc7929a2a5c13
+$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
 
 install : $(TARGET)
 
@@ -78,6 +82,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
+	#Save original r8169 module
+	-mv /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko \
+	    /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/r8169.ko.org
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8169_add_missing_pciids.patch
 	cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules