[SUNQE]: Fix MAC address assignment. (d0dc1129) · Commits · 戴 / test

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 <morcles@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/sunqe.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -845,6 +845,8 @@ static int __init qec_ether_init(struct sbus_dev *sdev)
	if (!dev)		if (!dev)
	return -ENOMEM;		return -ENOMEM;

			memcpy(dev->dev_addr, idprom->id_ethaddr, 6);

	qe = netdev_priv(dev);		qe = netdev_priv(dev);

	i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);		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 sunqe *qp = dev_get_drvdata(&dev->dev);
	struct net_device *net_dev = qp->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->qcregs, CREG_REG_SIZE);
	sbus_iounmap(qp->mregs, MREGS_REG_SIZE);		sbus_iounmap(qp->mregs, MREGS_REG_SIZE);

Admin message