Commit:     d0dc1129c2e5a5a0e53940cad44333e6bd2f9af3
Parent:     2e6679a0aa352e6b74f6385c49cd4dca3dc7201f
Author:     Marcel van Nies <[EMAIL PROTECTED]>
AuthorDate: Sat Apr 21 15:31:58 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Apr 21 15:31:58 2007 -0700

    [SUNQE]: Fix MAC address assignment.
    The MAC address assignment at module loading is simply forgotten.
    The bug at module unloading is caused by an incorrect call.
    The bug at module unloading does not only happen for sunqe,
    sunlance and sunhme (sbus) suffer from it too.
    I've tested this on my SS20.
    Signed-off-by: Marcel van Nies <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 drivers/net/sunqe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 7874eb1..f3bad56 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -845,6 +845,8 @@ static int __init qec_ether_init(struct sbus_dev *sdev)
        if (!dev)
                return -ENOMEM;
+       memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
        qe = netdev_priv(dev);
        i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);
@@ -960,7 +962,7 @@ static int __devexit qec_sbus_remove(struct of_device *dev)
        struct sunqe *qp = dev_get_drvdata(&dev->dev);
        struct net_device *net_dev = qp->dev;
-       unregister_netdevice(net_dev);
+       unregister_netdev(net_dev);
        sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
        sbus_iounmap(qp->mregs, MREGS_REG_SIZE);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to