[BUG] 2.6.29-rc7 broke r8169 MAC on Thecus n2100 ARM board

[Mikael Pettersson]

With the 2.6.29-rc7 kernel I'm unable to 'ifup' eth0 on my ARM-based
Thecus n2100 NAS box, which has an RTL8169 NIC (10ec:8169 (rev 10)).
A diff of the kernel logs from 2.6.29-rc6 and -rc7 shows that -rc7
first mangles and then zaps the MAC addresses:

--- dmesg-2.6.29-rc6	2009-03-09 20:27:49.000000000 +0100
+++ dmesg-2.6.29-rc7	2009-03-09 20:25:54.000000000 +0100
@@ -145,11 +145,13 @@
 r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
 r8169 0000:00:01.0: enabling Mem-Wr-Inval
 r8169 0000:00:01.0: no PCI Express capability
-eth0: RTL8169sb/8110sb at 0xe080c200, 00:14:fd:30:11:78, XID 10000000 IRQ 27
+r8169 0000:00:01.0: MAC address found in EEPROM: 00:14:fd:10:00:00
+eth0: RTL8169sb/8110sb at 0xe080c200, 00:00:00:00:00:00, XID 10000000 IRQ 27
 r8169 Gigabit Ethernet driver 2.3LK-NAPI loaded
 r8169 0000:00:02.0: enabling Mem-Wr-Inval
 r8169 0000:00:02.0: no PCI Express capability
-eth1: RTL8169sb/8110sb at 0xe0810300, 00:14:fd:30:11:79, XID 10000000 IRQ 30
+r8169 0000:00:02.0: MAC address found in EEPROM: 00:14:fd:10:00:00
+eth1: RTL8169sb/8110sb at 0xe0810300, 00:00:00:00:00:00, XID 10000000 IRQ 30
 Driver 'sd' needs updating - please use bus_type methods
 sata_sil 0000:00:03.0: version 2.4
 sata_sil 0000:00:03.0: Applying R_ERR on DMA activate FIS errata fix
@@ -242,6 +244,4 @@
 EXT3 FS on sda5, internal journal
 EXT3-fs: mounted filesystem with ordered data mode.
 Adding 2008116k swap on /dev/sda3.  Priority:-1 extents:1 across:2008116k 
-r8169: eth0: link up
-r8169: eth0: link up
 warning: `dbus-daemon' uses 32-bit capabilities (legacy support in use)

Reverting 6709fe9a27e43a4931938fe0d7f2cc5edef31386
"r8169: read MAC address from EEPROM on init (2nd attempt)"
fixes the problem on this machine.

/Mikael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/