diff options
author | shemminger@osdl.org <shemminger@osdl.org> | 2005-11-24 01:00:50 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 02:22:03 -0500 |
commit | 4f4c81504284c0ab66fc6d773dfb3b54aca02427 (patch) | |
tree | 88608faa793265891aed27d42236efaeb7e4f64b /drivers/net | |
parent | 596f86a8d8a70005728944143f08fe5414443355 (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sk98lin/skethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/sk98lin/skge.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c index fb639959292b..b71769ae4603 100644 --- a/drivers/net/sk98lin/skethtool.c +++ b/drivers/net/sk98lin/skethtool.c | |||
@@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = { | |||
549 | .phys_id = locateDevice, | 549 | .phys_id = locateDevice, |
550 | .get_pauseparam = getPauseParams, | 550 | .get_pauseparam = getPauseParams, |
551 | .set_pauseparam = setPauseParams, | 551 | .set_pauseparam = setPauseParams, |
552 | .get_link = ethtool_op_get_link, | ||
553 | .get_perm_addr = ethtool_op_get_perm_addr, | ||
552 | }; | 554 | }; |
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 857ade447889..6e2ffd684c29 100644 --- 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, | |||
4908 | 4908 | ||
4909 | SkGeYellowLED(pAC, pAC->IoBase, 1); | 4909 | SkGeYellowLED(pAC, pAC->IoBase, 1); |
4910 | 4910 | ||
4911 | |||
4912 | memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6); | 4911 | memcpy(&dev->dev_addr, &pAC->Addr.Net[0].CurrentMacAddress, 6); |
4912 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
4913 | 4913 | ||
4914 | SkGeProcCreate(dev); | 4914 | SkGeProcCreate(dev); |
4915 | 4915 | ||
@@ -4962,6 +4962,7 @@ static int __devinit skge_probe_one(struct pci_dev *pdev, | |||
4962 | SkGeProcCreate(dev); | 4962 | SkGeProcCreate(dev); |
4963 | memcpy(&dev->dev_addr, | 4963 | memcpy(&dev->dev_addr, |
4964 | &pAC->Addr.Net[1].CurrentMacAddress, 6); | 4964 | &pAC->Addr.Net[1].CurrentMacAddress, 6); |
4965 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | ||
4965 | 4966 | ||
4966 | printk("%s: %s\n", dev->name, pAC->DeviceStr); | 4967 | printk("%s: %s\n", dev->name, pAC->DeviceStr); |
4967 | printk(" PrefPort:B RlmtMode:Dual Check Link State\n"); | 4968 | printk(" PrefPort:B RlmtMode:Dual Check Link State\n"); |