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

[Martin Michlmayr]

Author: tbm
Date: Sun Aug  3 06:10:54 2008
New Revision: 11946

Log:
METH: fix MAC address setup.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Aug  3 06:10:54 2008
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.27~rc1-1~experimental.1) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * New upstream release
 
+  [ Martin Michlmayr ]
+  * METH: fix MAC address setup.
+
  -- maximilian attems <maks at debian.org>  Wed, 30 Jul 2008 18:23:09 +0200
 
 linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/meth-fix_mac.patch	Sun Aug  3 06:10:54 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/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sun Aug  3 06:10:54 2008
@@ -20,6 +20,7 @@
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
 + bugfix/mips/gbefb_fix_cmap_fifo_timeout.patch
++ bugfix/mips/meth-fix_mac.patch
 + bugfix/arm/disable-dvb_b2c2_flexcop.patch
 + bugfix/arm/disable-dvb_budget.patch
 + bugfix/arm/disable-netxen_nic.patch