From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Wed, 30 Jul 2008 23:14:24 +0000 (+0200)
Subject: METH: fix MAC address setup
X-Git-Tag: v2.6.27-rc3~69^2~13^2~18
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;ds=sidebyside;h=d91d4bb9db4a7b2a78accff3560bfd42988c56e4;p=safe%2Fjmp%2Flinux-2.6

METH: fix MAC address setup

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@alpha.franken.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

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;
 }