summaryrefslogtreecommitdiffstats
path: root/drivers/net/meth.c
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>2008-07-31 01:14:24 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-08-07 02:11:19 -0400
commitd91d4bb9db4a7b2a78accff3560bfd42988c56e4 (patch)
tree775c93da463d8cc586e76a06323a11fcd5f37351 /drivers/net/meth.c
parent0b1ab1b8a4f663a34c23f31d796fd08283b6077a (diff)
downloadlinux-d91d4bb9db4a7b2a78accff3560bfd42988c56e4.tar.gz
linux-d91d4bb9db4a7b2a78accff3560bfd42988c56e4.tar.bz2
linux-d91d4bb9db4a7b2a78accff3560bfd42988c56e4.zip
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>
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r--drivers/net/meth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 4cb364e67dc6..0a97c26df6ab 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;
}