[kernel] r11947 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Sun Aug  3 06:14:39 2008
New Revision: 11947

Log:
METH: fix MAC address setup


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug  3 06:14:39 2008
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.26-2) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * [powerpc] Install arch/powerpc/lib/crtsavres.o into the headers, it is
     used during module linking.
   * Add stable release 2.6.26.1:
@@ -66,6 +67,9 @@
     - udplite: Protection against coverage value wrap-around
     - pxamci: trivial fix of DMA alignment register bit clearing
 
+  [ Martin Michlmayr ]
+  * METH: fix MAC address setup
+
  -- Bastian Blank <waldi at debian.org>  Thu, 31 Jul 2008 19:45:03 +0200
 
 linux-2.6 (2.6.26-1) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch	Sun Aug  3 06:14:39 2008
@@ -0,0 +1,29 @@
+From:	Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+To:	netdev at vger.kernel.org, linux-mips at linux-mips.org
+cc:	ralf at linux-mips.org, jgarzik at pobox.com
+Subject: [PATCH] METH: fix MAC address setup
+Date:	Thu, 31 Jul 2008 01:14:24 +0200 (CEST)
+
+Setup of the mac filter lost the upper 16bit of the mac address. This
+bug got unconvered by a patch, which fixed the promiscous handling.
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+
+ drivers/net/meth.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/meth.c b/drivers/net/meth.c
+index 4cb364e..0a97c26 100644
+--- a/drivers/net/meth.c
++++ b/drivers/net/meth.c
+@@ -100,7 +100,7 @@ static inline void load_eaddr(struct net_device *dev)
+ 	DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
+ 	macaddr = 0;
+ 	for (i = 0; i < 6; i++)
+-		macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
++		macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8);
+ 
+ 	mace->eth.mac_addr = macaddr;
+ }
+

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2	Sun Aug  3 06:14:39 2008
@@ -1,2 +1,3 @@
 - bugfix/all/x86-acpi-sleep-x61s.patch
 + bugfix/all/stable/2.6.26.1.patch
++ bugfix/mips/meth-fix_mac.patch