]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
METH: fix MAC address setup
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Wed, 30 Jul 2008 23:14:24 +0000 (01:14 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 7 Aug 2008 06:11:19 +0000 (02:11 -0400)
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>
drivers/net/meth.c

index 4cb364e67dc65f5d022663794e6d8d0b32a6255d..0a97c26df6abd848ddc8f09bb97db75cedab1453 100644 (file)
@@ -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;
 }