jme: convert offload constraints to ndo_fix_features

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index 351fb3b384eb591119585b6e3a79022c0a2b735c..925a1cd038b86e23fce73454a95863b1914da6c1 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -769,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);
@@ -778,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;
 }
 
@@ -979,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 +
@@ -997,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;
 }
@@ -2316,6 +2343,7 @@ jme_change_mtu(struct net_device *netdev, int new_mtu)
                jme_restart_rx_engine(jme);
        }
 
+#ifndef __USE_NDO_FIX_FEATURES__
        if (new_mtu > 1900) {
                netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
                                NETIF_F_TSO | NETIF_F_TSO6);
@@ -2325,8 +2353,12 @@ jme_change_mtu(struct net_device *netdev, int new_mtu)
                if (test_bit(JME_FLAG_TSO, &jme->flags))
                        netdev->features |= NETIF_F_TSO | NETIF_F_TSO6;
        }
+#endif
 
        netdev->mtu = new_mtu;
+#ifdef __USE_NDO_FIX_FEATURES__
+       netdev_update_features(netdev);
+#endif
        jme_reset_link(jme);
 
        return 0;
@@ -2748,6 +2780,7 @@ jme_set_msglevel(struct net_device *netdev, u32 value)
        jme->msg_enable = value;
 }
 
+#ifndef __USE_NDO_FIX_FEATURES__
 static u32
 jme_get_rx_csum(struct net_device *netdev)
 {
@@ -2806,6 +2839,31 @@ jme_set_tso(struct net_device *netdev, u32 on)
 
        return 0;
 }
+#else
+static u32
+jme_fix_features(struct net_device *netdev, u32 features)
+{
+       if (netdev->mtu > 1900)
+               features &= ~(NETIF_F_ALL_TSO | NETIF_F_ALL_CSUM);
+       return features;
+}
+
+static int
+jme_set_features(struct net_device *netdev, u32 features)
+{
+       struct jme_adapter *jme = netdev_priv(netdev);
+
+       spin_lock_bh(&jme->rxmcs_lock);
+       if (features & NETIF_F_RXCSUM)
+               jme->reg_rxmcs |= RXMCS_CHECKSUM;
+       else
+               jme->reg_rxmcs &= ~RXMCS_CHECKSUM;
+       jwrite32(jme, JME_RXMCS, jme->reg_rxmcs);
+       spin_unlock_bh(&jme->rxmcs_lock);
+
+       return 0;
+}
+#endif
 
 static int
 jme_nway_reset(struct net_device *netdev)
@@ -2952,11 +3010,13 @@ static const struct ethtool_ops jme_ethtool_ops = {
        .get_link               = jme_get_link,
        .get_msglevel           = jme_get_msglevel,
        .set_msglevel           = jme_set_msglevel,
+#ifndef __USE_NDO_FIX_FEATURES__
        .get_rx_csum            = jme_get_rx_csum,
        .set_rx_csum            = jme_set_rx_csum,
        .set_tx_csum            = jme_set_tx_csum,
        .set_tso                = jme_set_tso,
        .set_sg                 = ethtool_op_set_sg,
+#endif
        .nway_reset             = jme_nway_reset,
        .get_eeprom_len         = jme_get_eeprom_len,
        .get_eeprom             = jme_get_eeprom,
@@ -3040,6 +3100,10 @@ static const struct net_device_ops jme_netdev_ops = {
        .ndo_change_mtu         = jme_change_mtu,
        .ndo_tx_timeout         = jme_tx_timeout,
        .ndo_vlan_rx_register   = jme_vlan_rx_register,
+#ifdef __USE_NDO_FIX_FEATURES__
+       .ndo_fix_features       = jme_fix_features,
+       .ndo_set_features       = jme_set_features,
+#endif
 };
 #endif
 
@@ -3111,6 +3175,14 @@ jme_init_one(struct pci_dev *pdev,
 #endif
        netdev->ethtool_ops             = &jme_ethtool_ops;
        netdev->watchdog_timeo          = TX_TIMEOUT;
+#ifdef __USE_NDO_FIX_FEATURES__
+       netdev->hw_features             =       NETIF_F_IP_CSUM |
+                                               NETIF_F_IPV6_CSUM |
+                                               NETIF_F_SG |
+                                               NETIF_F_TSO |
+                                               NETIF_F_TSO6 |
+                                               NETIF_F_RXCSUM;
+#endif
        netdev->features                =       NETIF_F_IP_CSUM |
                                                NETIF_F_IPV6_CSUM |
                                                NETIF_F_SG |
@@ -3194,8 +3266,14 @@ jme_init_one(struct pci_dev *pdev,
        jme->reg_txpfc = 0;
        jme->reg_pmcs = PMCS_MFEN;
        jme->reg_gpreg1 = GPREG1_DEFAULT;
+#ifndef __USE_NDO_FIX_FEATURES__
        set_bit(JME_FLAG_TXCSUM, &jme->flags);
        set_bit(JME_FLAG_TSO, &jme->flags);
+#else
+
+       if (jme->reg_rxmcs & RXMCS_CHECKSUM)
+               netdev->features |= NETIF_F_RXCSUM;
+#endif
 
        /*
         * Get Max Read Req Size from PCI Config Space