X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=jme.c;h=4e4613a3dc2ffd80c765ee3d13d56dcc78cda5fd;hb=65ff9ddf0790b82e63c4c678d2be91fdfc313659;hp=4fb3c50ee17fdeeb780a5eb2cc63fc83a1b7d9ea;hpb=614c0bfd43efd9b3d4605cc3a966d7f2e9897d9c;p=jme.git diff --git a/jme.c b/jme.c index 4fb3c50..4e4613a 100644 --- a/jme.c +++ b/jme.c @@ -59,6 +59,21 @@ module_param(no_extplug, int, 0); 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) +{ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) + pci_enable_wake(jme->pdev, PCI_D1, enable); + pci_enable_wake(jme->pdev, PCI_D2, enable); + pci_enable_wake(jme->pdev, PCI_D3hot, enable); + pci_enable_wake(jme->pdev, PCI_D3cold, enable); +#else + pci_pme_active(jme->pdev, enable); +#endif +} +#endif + static int jme_mdio_read(struct net_device *netdev, int phy, int reg) { @@ -274,13 +289,7 @@ jme_reset_mac_processor(struct jme_adapter *jme) static inline void jme_clear_pm(struct jme_adapter *jme) { - jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs); - pci_set_power_state(jme->pdev, PCI_D0); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) - pci_enable_wake(jme->pdev, PCI_D0, false); -#else - device_set_wakeup_enable(&jme->pdev->dev, false); -#endif + jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs); } static int @@ -970,11 +979,29 @@ static u16 jme_udpsum(struct sk_buff *skb) { u16 csum = 0xFFFFu; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21) + struct iphdr *iph; + int iphlen; + struct udphdr *udph; +#endif if (skb->len < (ETH_HLEN + sizeof(struct iphdr))) return csum; if (skb->protocol != htons(ETH_P_IP)) return csum; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21) + iph = (struct iphdr *)skb_pull(skb, ETH_HLEN); + iphlen = (iph->ihl << 2); + if ((iph->protocol != IPPROTO_UDP) || + (skb->len < (iphlen + sizeof(struct udphdr)))) { + skb_push(skb, ETH_HLEN); + return csum; + } + udph = (struct udphdr *)skb_pull(skb, iphlen); + csum = udph->check; + skb_push(skb, iphlen); + skb_push(skb, ETH_HLEN); +#else skb_set_network_header(skb, ETH_HLEN); if ((ip_hdr(skb)->protocol != IPPROTO_UDP) || (skb->len < (ETH_HLEN + @@ -988,6 +1015,7 @@ jme_udpsum(struct sk_buff *skb) csum = udp_hdr(skb)->check; skb_reset_transport_header(skb); skb_reset_network_header(skb); +#endif return csum; } @@ -1847,11 +1875,9 @@ jme_powersave_phy(struct jme_adapter *jme) { 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); } @@ -2150,7 +2176,8 @@ jme_stop_queue_if_full(struct jme_adapter *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); } } @@ -2633,9 +2660,11 @@ jme_set_wol(struct net_device *netdev, 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); + device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs)); #endif return 0; @@ -2661,7 +2690,8 @@ jme_set_settings(struct net_device *netdev, 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; /* @@ -3239,6 +3269,14 @@ jme_init_one(struct pci_dev *pdev, 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); @@ -3324,10 +3362,11 @@ jme_shutdown(struct pci_dev *pdev) struct jme_adapter *jme = netdev_priv(netdev); jme_powersave_phy(jme); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) - pci_enable_wake(pdev, PCI_D3hot, true); -#else - pci_pme_active(pdev, true); +#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 } @@ -3343,13 +3382,13 @@ jme_shutdown(struct pci_dev *pdev) #ifdef JME_HAVE_PM static int -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) -jme_suspend(struct pci_dev *pdev, pm_message_t state) -#else +#ifdef JME_NEW_PM_API jme_suspend(struct device *dev) +#else +jme_suspend(struct pci_dev *pdev, pm_message_t state) #endif { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38) +#ifdef JME_NEW_PM_API struct pci_dev *pdev = to_pci_dev(dev); #endif struct net_device *netdev = pci_get_drvdata(pdev); @@ -3384,13 +3423,9 @@ jme_suspend(struct device *dev) tasklet_hi_enable(&jme->rxempty_task); jme_powersave_phy(jme); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) +#ifndef JME_NEW_PM_API pci_save_state(pdev); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) - pci_enable_wake(pdev, PCI_D3hot, true); -#else - pci_pme_active(pdev, true); -#endif + jme_pci_wakeup_enable(jme, !!(jme->reg_pmcs)); pci_set_power_state(pdev, PCI_D3hot); #endif @@ -3398,20 +3433,21 @@ jme_suspend(struct device *dev) } static int -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) -jme_resume(struct pci_dev *pdev) -#else +#ifdef JME_NEW_PM_API jme_resume(struct device *dev) +#else +jme_resume(struct pci_dev *pdev) #endif { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38) +#ifdef JME_NEW_PM_API struct pci_dev *pdev = to_pci_dev(dev); #endif struct net_device *netdev = pci_get_drvdata(pdev); struct jme_adapter *jme = netdev_priv(netdev); jme_clear_pm(jme); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,38) +#ifndef JME_NEW_PM_API + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); #endif @@ -3431,14 +3467,14 @@ jme_resume(struct device *dev) 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 @@ -3459,7 +3495,7 @@ static struct pci_driver jme_driver = { .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