MODULE_PARM_DESC(no_extplug,
"Do not use external plug signal for pseudo hot-plug.");
+#ifndef JME_NEW_PM_API
static void
jme_pci_wakeup_enable(struct jme_adapter *jme, int enable)
{
pci_pme_active(jme->pdev, enable);
#endif
}
+#endif
static int
jme_mdio_read(struct net_device *netdev, int phy, int reg)
{
if (jme->reg_pmcs) {
jme_set_100m_half(jme);
-
if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
jme_wait_link(jme);
-
- jwrite32(jme, JME_PMCS, jme->reg_pmcs);
+ jme_clear_pm(jme);
} else {
jme_phy_off(jme);
}
(jiffies - txbi->start_xmit) >= TX_TIMEOUT &&
txbi->skb)) {
netif_stop_queue(jme->dev);
- netif_info(jme, tx_queued, jme->dev, "TX Queue Stopped %d@%lu\n", idx, jiffies);
+ netif_info(jme, tx_queued, jme->dev,
+ "TX Queue Stopped %d@%lu\n", idx, jiffies);
}
}
jme->reg_pmcs |= PMCS_MFEN;
jwrite32(jme, JME_PMCS, jme->reg_pmcs);
-
#ifndef JME_NEW_PM_API
jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs));
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
#endif
+
return 0;
}
struct jme_adapter *jme = netdev_priv(netdev);
int rc, fdc = 0;
- if (ecmd->speed == SPEED_1000 && ecmd->autoneg != AUTONEG_ENABLE)
+ if (ethtool_cmd_speed(ecmd) == SPEED_1000
+ && ecmd->autoneg != AUTONEG_ENABLE)
return -EINVAL;
/*
set_bit(JME_FLAG_TXCSUM, &jme->flags);
set_bit(JME_FLAG_TSO, &jme->flags);
- jme_clear_pm(jme);
- pci_set_power_state(jme->pdev, PCI_D0);
-#ifndef JME_NEW_PM_API
- jme_pci_wakeup_enable(jme, true);
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- device_set_wakeup_enable(&jme->pdev->dev, true);
-#endif
-
/*
* Get Max Read Req Size from PCI Config Space
*/
jme->mii_if.mdio_read = jme_mdio_read;
jme->mii_if.mdio_write = jme_mdio_write;
+ jme_clear_pm(jme);
+ pci_set_power_state(jme->pdev, PCI_D0);
+#ifndef JME_NEW_PM_API
+ jme_pci_wakeup_enable(jme, true);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ device_set_wakeup_enable(&pdev->dev, true);
+#endif
+
jme_set_phyfifo_5level(jme);
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22)
pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->pcirev);
struct net_device *netdev = pci_get_drvdata(pdev);
struct jme_adapter *jme = netdev_priv(netdev);
- if (jme->reg_pmcs) {
- jme_powersave_phy(jme);
- jme_pci_wakeup_enable(jme, true);
+ jme_powersave_phy(jme);
+#ifndef JME_NEW_PM_API
+ jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs));
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- device_set_wakeup_enable(&jme->pdev->dev, true);
+ device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
#endif
- } else {
- jme_phy_off(jme);
- }
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
jme_powersave_phy(jme);
#ifndef JME_NEW_PM_API
pci_save_state(pdev);
- jme_pci_wakeup_enable(jme, true);
+ jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs));
pci_set_power_state(pdev, PCI_D3hot);
#endif
- jme_clear_pm(jme);
return 0;
}
return 0;
}
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+#ifdef JME_NEW_PM_API
static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume);
#define JME_PM_OPS (&jme_pm_ops)
#endif
#else
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)
+#ifdef JME_NEW_PM_API
#define JME_PM_OPS NULL
#endif
#endif
.probe = jme_init_one,
.remove = __devexit_p(jme_remove_one),
.shutdown = jme_shutdown,
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38)
+#ifndef JME_NEW_PM_API
.suspend = jme_suspend,
.resume = jme_resume
#else