Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/lfs/r8169 b/lfs/r8169
index fe70596505421271935435e233fe6e4eb40ba58b..a43bdae766574636cd97e25515304d07c0624ca9 100644 (file)
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -79,6 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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
        cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net 
        @rm -rf $(DIR_APP)

diff --git a/src/patches/r8169_add_missing_pciids.patch b/src/patches/r8169_add_missing_pciids.patch
new file mode 100644 (file)
index 0000000..592ba9a
--- /dev/null
+++ b/src/patches/r8169_add_missing_pciids.patch
@@ -0,0 +1,15 @@
+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-21 23:24:26.000000000 +0200
+@@ -114,6 +114,11 @@
+ 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_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
++      { 0x1186,0x4300, 0, 0, RTL_CFG_0 },
++      { 0x1737,0x1032, 0, 0, RTL_CFG_0 },
++      { 0x1259,0xC107, 0, 0, RTL_CFG_0 },
++      { 0x16EC,0x8129, 0, 0, RTL_CFG_0 },
+       {0,},
+ };
+