Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / drivers / net / meth.c

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index fe5b6c3..cdaa8fc 100644 (file)
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -33,7 +33,6 @@
 #include <asm/ip32/ip32_ints.h>
 
 #include <asm/io.h>
-#include <asm/scatterlist.h>
 
 #include "meth.h"
 
@@ -95,12 +94,15 @@ char o2meth_eaddr[8]={0,0,0,0,0,0,0,0};
 static inline void load_eaddr(struct net_device *dev)
 {
        int i;
-       DPRINTK("Loading MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               (int)o2meth_eaddr[0]&0xFF,(int)o2meth_eaddr[1]&0xFF,(int)o2meth_eaddr[2]&0xFF,
-               (int)o2meth_eaddr[3]&0xFF,(int)o2meth_eaddr[4]&0xFF,(int)o2meth_eaddr[5]&0xFF);
+       DECLARE_MAC_BUF(mac);
+       u64 macaddr;
+
+       DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
+       macaddr = 0;
        for (i = 0; i < 6; i++)
-               dev->dev_addr[i] = o2meth_eaddr[i];
-       mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
+               macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+
+       mace->eth.mac_addr = macaddr;
 }
 
 /*
@@ -795,6 +797,7 @@ static int __init meth_probe(struct platform_device *pdev)
 #endif
        dev->irq             = MACE_ETHERNET_IRQ;
        dev->base_addr       = (unsigned long)&mace->eth;
+       memcpy(dev->dev_addr, o2meth_eaddr, 6);
 
        priv = netdev_priv(dev);
        spin_lock_init(&priv->meth_lock);