[PATCH] sk98lin: add permanent address support

Add permanent address and link status support via ethtool.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
index fb639959292b3656d375a04c68cc6bee4d3e8fe1..b71769ae4603ac3a0f89c07aefd626f63795438e 100644 (file)
--- a/drivers/net/sk98lin/skethtool.c
+++ b/drivers/net/sk98lin/skethtool.c
@@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = {
        .phys_id                = locateDevice,
        .get_pauseparam         = getPauseParams,
        .set_pauseparam         = setPauseParams,
+       .get_link               = ethtool_op_get_link,
+       .get_perm_addr          = ethtool_op_get_perm_addr,
 };

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 857ade447889dd636dcd74d3535016be89679b7d..6e2ffd684c292495f926f33289bfae2ce3ef0f59 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -4908,8 +4908,8 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
 
        SkGeYellowLED(pAC, pAC->IoBase, 1);
 
-
        memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6);
+       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
        SkGeProcCreate(dev);
 
@@ -4962,6 +4962,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
                        SkGeProcCreate(dev);
                        memcpy(&dev->dev_addr,
                                        &pAC->Addr.Net[1].CurrentMacAddress, 6);
+                       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
        
                        printk("%s: %s\n", dev->name, pAC->DeviceStr);
                        printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");