git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Fix IRQ nobody cared issue with ath9k
[pandora-kernel.git]
/
drivers
/
net
/
forcedeth.c
diff --git
a/drivers/net/forcedeth.c
b/drivers/net/forcedeth.c
index
331b86b
..
eeb55ed
100644
(file)
--- a/
drivers/net/forcedeth.c
+++ b/
drivers/net/forcedeth.c
@@
-5643,6
+5643,7
@@
static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);
dev->dev_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
dev->dev_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
writel(txreg|NVREG_TRANSMITPOLL_MAC_ADDR_REV, base + NvRegTransmitPoll);
+ printk(KERN_DEBUG "nv_probe: set workaround bit for reversed mac addr\n");
}
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
}
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
@@
-5890,14
+5891,12
@@
static void nv_restore_phy(struct net_device *dev)
}
}
}
}
-static void
__devexit nv_remove
(struct pci_dev *pci_dev)
+static void
nv_restore_mac_addr
(struct pci_dev *pci_dev)
{
struct net_device *dev = pci_get_drvdata(pci_dev);
struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev);
{
struct net_device *dev = pci_get_drvdata(pci_dev);
struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev);
- unregister_netdev(dev);
-
/* special op: write back the misordered MAC address - otherwise
* the next nv_probe would see a wrong address.
*/
/* special op: write back the misordered MAC address - otherwise
* the next nv_probe would see a wrong address.
*/
@@
-5905,6
+5904,15
@@
static void __devexit nv_remove(struct pci_dev *pci_dev)
writel(np->orig_mac[1], base + NvRegMacAddrB);
writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,
base + NvRegTransmitPoll);
writel(np->orig_mac[1], base + NvRegMacAddrB);
writel(readl(base + NvRegTransmitPoll) & ~NVREG_TRANSMITPOLL_MAC_ADDR_REV,
base + NvRegTransmitPoll);
+}
+
+static void __devexit nv_remove(struct pci_dev *pci_dev)
+{
+ struct net_device *dev = pci_get_drvdata(pci_dev);
+
+ unregister_netdev(dev);
+
+ nv_restore_mac_addr(pci_dev);
/* restore any phy related changes */
nv_restore_phy(dev);
/* restore any phy related changes */
nv_restore_phy(dev);
@@
-5975,10
+5983,14
@@
static void nv_shutdown(struct pci_dev *pdev)
if (netif_running(dev))
nv_close(dev);
if (netif_running(dev))
nv_close(dev);
-
pci_enable_wake(pdev, PCI_D3hot, np->wolenabled
);
- pci_enable_wake(pdev, PCI_D3cold, np->wolenabled);
+
nv_restore_mac_addr(pdev
);
+
pci_disable_device(pdev);
pci_disable_device(pdev);
- pci_set_power_state(pdev, PCI_D3hot);
+ if (system_state == SYSTEM_POWER_OFF) {
+ if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled))
+ pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);
+ pci_set_power_state(pdev, PCI_D3hot);
+ }
}
#else
#define nv_suspend NULL
}
#else
#define nv_suspend NULL