(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;
}
jme_pci_wakeup_enable(jme, true);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- device_set_wakeup_enable(&jme->pdev->dev, true);
+ device_set_wakeup_enable(&pdev->dev, true);
#endif
jme_set_phyfifo_5level(jme);
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