From dcdba588c9d4856614dc941c05abe688537fc0e9 Mon Sep 17 00:00:00 2001 From: "shemminger@osdl.org" Date: Wed, 23 Nov 2005 22:00:50 -0800 Subject: [PATCH] --- yaml --- r: 14889 b: refs/heads/master c: 4f4c81504284c0ab66fc6d773dfb3b54aca02427 h: refs/heads/master i: 14887: 3061fb58a69b043fa6e0ced49239be04c9400457 v: v3 --- [refs] | 2 +- trunk/drivers/net/sk98lin/skethtool.c | 2 ++ trunk/drivers/net/sk98lin/skge.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 99bee7ee3f8d..e34831e06123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 596f86a8d8a70005728944143f08fe5414443355 +refs/heads/master: 4f4c81504284c0ab66fc6d773dfb3b54aca02427 diff --git a/trunk/drivers/net/sk98lin/skethtool.c b/trunk/drivers/net/sk98lin/skethtool.c index fb639959292b..b71769ae4603 100644 --- a/trunk/drivers/net/sk98lin/skethtool.c +++ b/trunk/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/trunk/drivers/net/sk98lin/skge.c b/trunk/drivers/net/sk98lin/skge.c index 857ade447889..6e2ffd684c29 100644 --- a/trunk/drivers/net/sk98lin/skge.c +++ b/trunk/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");