Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

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

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0c89b02..4cb364e 100644 (file)
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -95,11 +95,14 @@ static inline void load_eaddr(struct net_device *dev)
 {
        int i;
        DECLARE_MAC_BUF(mac);
+       u64 macaddr;
 
-       for (i = 0; i < 6; i++)
-               dev->dev_addr[i] = o2meth_eaddr[i];
        DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
-       mace->eth.mac_addr = (*(unsigned long*)o2meth_eaddr) >> 16;
+       macaddr = 0;
+       for (i = 0; i < 6; i++)
+               macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+
+       mace->eth.mac_addr = macaddr;
 }
 
 /*
@@ -284,7 +287,7 @@ int meth_reset(struct net_device *dev)
 
        /* Initial mode: 10 | Half-duplex | Accept normal packets */
        priv->mac_ctrl = METH_ACCEPT_MCAST | METH_DEFAULT_IPG;
-       if (dev->flags | IFF_PROMISC)
+       if (dev->flags & IFF_PROMISC)
                priv->mac_ctrl |= METH_PROMISC;
        mace->eth.mac_ctrl = priv->mac_ctrl;
 
@@ -794,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);
@@ -826,6 +830,7 @@ static struct platform_driver meth_driver = {
        .remove = __devexit_p(meth_remove),
        .driver = {
                .name   = "meth",
+               .owner  = THIS_MODULE,
        }
 };
 
@@ -851,3 +856,4 @@ module_exit(meth_exit_module);
 MODULE_AUTHOR("Ilya Volynets <ilya@theIlya.com>");
 MODULE_DESCRIPTION("SGI O2 Builtin Fast Ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:meth");