diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
| commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
| tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/meth.c | |
| parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
| parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | 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 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) | |||
| 100 | DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr)); | 100 | DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr)); |
| 101 | macaddr = 0; | 101 | macaddr = 0; |
| 102 | for (i = 0; i < 6; i++) | 102 | for (i = 0; i < 6; i++) |
| 103 | macaddr |= dev->dev_addr[i] << ((5 - i) * 8); | 103 | macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8); |
| 104 | 104 | ||
| 105 | mace->eth.mac_addr = macaddr; | 105 | mace->eth.mac_addr = macaddr; |
| 106 | } | 106 | } |