From 102619d9562b3de2df990f79124c029f839d24d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=F6rn=20Steinbrink?= Date: Mon, 7 Jan 2008 23:22:53 -0800 Subject: [PATCH] --- yaml --- r: 75343 b: refs/heads/master c: 2e3884b5b16795c03a7bf295797c1b2402885b88 h: refs/heads/master i: 75341: 097f4829df6b8ce9c8d4cd732569132774f276c7 75339: c8442032215a2e7269109e89c2689d1461124175 75335: 3c10cfc95b2765c21cf2d8f8d86e7ff39025baae 75327: 759a1ace1423c0e62d2cc6072e567e7b5f108d54 v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5cf5102ffe50..01d5176e7745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d39da3dcaad4231f0fa75024b1d6d710a2ced74 +refs/heads/master: 2e3884b5b16795c03a7bf295797c1b2402885b88 diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index a96583cceb5e..f84c752997a4 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -5199,10 +5199,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff; dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff; dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff; - /* set permanent address to be correct aswell */ - np->orig_mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + - (dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24); - np->orig_mac[1] = (dev->dev_addr[4] << 0) + (dev->dev_addr[5] << 8); writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll); } memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); @@ -5414,6 +5410,8 @@ static void __devexit nv_remove(struct pci_dev *pci_dev) */ writel(np->orig_mac[0], base + NvRegMacAddrA); writel(np->orig_mac[1], base + NvRegMacAddrB); + writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV, + base + NvRegTransmitPoll); /* free all structures */ free_rings(dev);