From 85f029d1868dc0e2af86f11acac06e9580d8fe77 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 14 Oct 2012 13:01:17 +0200 Subject: [PATCH] r81xx: updated realtek vendor drivers. --- lfs/r8101 | 9 ++++++--- lfs/r8168 | 9 ++++++--- lfs/r8169 | 9 ++++++--- make.sh | 18 +++++++++--------- src/patches/r8169_add_missing_pciids.patch | 10 ++++++---- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/lfs/r8101 b/lfs/r8101 index 266e891bd1..e1c8206ef3 100644 --- a/lfs/r8101 +++ b/lfs/r8101 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -25,8 +25,11 @@ include Config VERSUFIX = ipfire$(KCFG) +ifeq "$(KCFG)" "-xen" + KVER = 2.6.32.60 +endif -VER = 1.019.00 +VER = 1.023.00 THISAPP = r8101-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2804355badc4cb14f091dd8b32d270c3 +$(DL_FILE)_MD5 = 03cfc34e41522cd34ac6f4b1b6508896 install : $(TARGET) diff --git a/lfs/r8168 b/lfs/r8168 index 2a4e2abad2..09a55f00d2 100644 --- a/lfs/r8168 +++ b/lfs/r8168 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -25,8 +25,11 @@ include Config VERSUFIX = ipfire$(KCFG) +ifeq "$(KCFG)" "-xen" + KVER = 2.6.32.60 +endif -VER = 8.019.00 +VER = 8.032.00 THISAPP = r8168-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f6934fc5df1dfb5fea82e4a310568890 +$(DL_FILE)_MD5 = 942ce02459a181093f77bb4d5cc75d45 install : $(TARGET) diff --git a/lfs/r8169 b/lfs/r8169 index 85a6dc179d..3e8341b709 100644 --- a/lfs/r8169 +++ b/lfs/r8169 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -25,8 +25,11 @@ include Config VERSUFIX = ipfire$(KCFG) +ifeq "$(KCFG)" "-xen" + KVER = 2.6.32.60 +endif -VER = 6.014.00 +VER = 6.017.00 THISAPP = r8169-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3 +$(DL_FILE)_MD5 = 396d7e28d573bde416fbdfdef723f4bd install : $(TARGET) diff --git a/make.sh b/make.sh index 768fde76a9..2a5809c25b 100755 --- a/make.sh +++ b/make.sh @@ -383,9 +383,9 @@ buildipfire() { ipfiremake mISDN KCFG="-xen" ipfiremake cryptodev KCFG="-xen" ipfiremake compat-wireless KCFG="-xen" -# ipfiremake r8169 KCFG="-xen" -# ipfiremake r8168 KCFG="-xen" -# ipfiremake r8101 KCFG="-xen" + ipfiremake r8169 KCFG="-xen" + ipfiremake r8168 KCFG="-xen" + ipfiremake r8101 KCFG="-xen" # ipfiremake e1000 KCFG="-xen" # ipfiremake e1000e KCFG="-xen" # ipfiremake igb KCFG="-xen" @@ -397,9 +397,9 @@ buildipfire() { ipfiremake mISDN KCFG="-pae" ipfiremake cryptodev KCFG="-pae" ipfiremake compat-wireless KCFG="-pae" -# ipfiremake r8169 KCFG="-pae" -# ipfiremake r8168 KCFG="-pae" -# ipfiremake r8101 KCFG="-pae" + ipfiremake r8169 KCFG="-pae" + ipfiremake r8168 KCFG="-pae" + ipfiremake r8101 KCFG="-pae" # ipfiremake e1000 KCFG="-pae" # ipfiremake e1000e KCFG="-pae" # ipfiremake igb KCFG="-pae" @@ -411,9 +411,9 @@ buildipfire() { ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" ipfiremake compat-wireless KCFG="" -# ipfiremake r8169 KCFG="" -# ipfiremake r8168 KCFG="" -# ipfiremake r8101 KCFG="" + ipfiremake r8169 KCFG="" + ipfiremake r8168 KCFG="" + ipfiremake r8101 KCFG="" # ipfiremake e1000 KCFG="" # ipfiremake e1000e KCFG="" # ipfiremake igb KCFG="" diff --git a/src/patches/r8169_add_missing_pciids.patch b/src/patches/r8169_add_missing_pciids.patch index dab3af0d20..86916f6488 100644 --- a/src/patches/r8169_add_missing_pciids.patch +++ b/src/patches/r8169_add_missing_pciids.patch @@ -1,12 +1,14 @@ -diff -Naur r8169-6.011.00.org/src/r8169_n.c r8169-6.011.00/src/r8169_n.c ---- r8169-6.011.00.org/src/r8169_n.c 2009-07-14 08:39:25.000000000 +0200 -+++ r8169-6.011.00/src/r8169_n.c 2009-10-22 19:18:42.000000000 +0200 -@@ -114,6 +114,11 @@ +diff -Naur r8169-6.017.00.org/src/r8169_n.c r8169-6.017.00/src/r8169_n.c +--- r8169-6.017.00.org/src/r8169_n.c 2012-05-03 14:23:12.000000000 +0200 ++++ r8169-6.017.00/src/r8169_n.c 2012-10-14 12:43:52.478555777 +0200 +@@ -115,7 +115,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 }, { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, +- { PCI_VENDOR_ID_DLINK, 0x4300, PCI_VENDOR_ID_DLINK, 0x4c00, 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, ++ { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_AT, 0xC107), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(0x16EC, 0x0116), 0, 0, RTL_CFG_0 }, + { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 }, -- 2.39.2