Advance version number after critical fix

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index ab6e154f466d636700443f26c7176a2fc8e94f05..9da34cb4fb6304d0423a48e24b9dc4060684605d 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -59,6 +59,7 @@ 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)
 {
@@ -71,6 +72,7 @@ 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)
@@ -767,6 +769,7 @@ jme_make_new_rx_buf(struct jme_adapter *jme, int i)
        struct jme_ring *rxring = &(jme->rxring[0]);
        struct jme_buffer_info *rxbi = rxring->bufinf + i;
        struct sk_buff *skb;
+       dma_addr_t mapping;
 
        skb = netdev_alloc_skb(jme->dev,
                jme->dev->mtu + RX_EXTRA_LEN);
@@ -776,14 +779,21 @@ jme_make_new_rx_buf(struct jme_adapter *jme, int i)
        skb->dev = jme->dev;
 #endif
 
+       mapping = pci_map_page(jme->pdev, virt_to_page(skb->data),
+                              offset_in_page(skb->data), skb_tailroom(skb),
+                              PCI_DMA_FROMDEVICE);
+       if (unlikely(pci_dma_mapping_error(jme->pdev, mapping))) {
+               dev_kfree_skb(skb);
+               return -ENOMEM;
+       }
+
+       if (likely(rxbi->mapping))
+               pci_unmap_page(jme->pdev, rxbi->mapping,
+                              rxbi->len, PCI_DMA_FROMDEVICE);
+
        rxbi->skb = skb;
        rxbi->len = skb_tailroom(skb);
-       rxbi->mapping = pci_map_page(jme->pdev,
-                                       virt_to_page(skb->data),
-                                       offset_in_page(skb->data),
-                                       rxbi->len,
-                                       PCI_DMA_FROMDEVICE);
-
+       rxbi->mapping = mapping;
        return 0;
 }
 
@@ -977,11 +987,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 +
@@ -995,6 +1023,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;
 }