[kernel] r7188 - in dists/sid/linux-2.6/debian: patches patches/series

[Martin Michlmayr]

Author: tbm
Date: Fri Aug 18 11:32:45 2006
New Revision: 7188

Added:
   dists/sid/linux-2.6/debian/patches/mips-tulip-2700.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/7-extra

Log:
mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Aug 18 11:32:45 2006
@@ -9,6 +9,7 @@
   * arm/iop32x: Enable a number of MD and DM modules.
   * arm/iop32x: Enable some more USB network modules.
   * mipsel/r5k-cobalt: Increase 8250 NR_UARTS and RUNTIME_UARTS to 4.
+  * mipsel/r5k-cobalt: Fix MAC detection problem on Qube 2700.
 
   [ Kyle McMartin ]
   * Apply patch to fix pa8800 (mostly...)

Added: dists/sid/linux-2.6/debian/patches/mips-tulip-2700.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/mips-tulip-2700.patch	Fri Aug 18 11:32:45 2006
@@ -0,0 +1,23 @@
+# Corrects a bogus change in mips-tulip.patch
+
+This patch fixes the invalid MAC address problem on the Qube2700.
+
+P.
+
+--- build-mipsel-none-r5k-cobalt.orig/drivers/net/tulip/de2104x.c	2006-08-16 16:03:18.000000000 +0100
++++ build-mipsel-none-r5k-cobalt/drivers/net/tulip/de2104x.c	2006-08-17 17:03:34.000000000 +0100
+@@ -1779,12 +1779,14 @@
+ 		((u16 *)ee_data)[i] =
+ 			le16_to_cpu(tulip_read_eeprom(de->regs, i, ee_addr_size));
+ 
++#ifndef CONFIG_MIPS_COBALT
+ 	/* DEC now has a specification but early board makers
+ 	   just put the address in the first EEPROM locations. */
+ 	/* This does  memcmp(eedata, eedata+16, 8) */
+ 	for (i = 0; i < 8; i ++)
+ 		if (ee_data[i] != ee_data[16+i])
+ 			sa_offset = 20;
++#endif
+ 
+ 	/* store MAC address */
+ 	for (i = 0; i < 6; i ++)

Modified: dists/sid/linux-2.6/debian/patches/series/7-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/7-extra	(original)
+++ dists/sid/linux-2.6/debian/patches/series/7-extra	Fri Aug 18 11:32:45 2006
@@ -2,3 +2,4 @@
 + xen-fedora-28927.patch *_xen *_xen-vserver
 + xen-fedora-28927-fix.patch *_xen *_xen-vserver
 + xen-tls.patch *_xen *_xen-vserver
++ mips-tulip-2700.patch mipsel