drivers/net: avoid some skb->ip_summed initializations

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index c5f92023afa456322cf1042eca14af0e0270d0e1..e8afe85cf9a3a0a19640bad2d9ae0d7d003580a2 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -103,8 +103,6 @@ jme_mdio_write(struct net_device *netdev,
 
        if (i == 0)
                jeprintk(jme->pdev, "phy(%d) write timeout : %d\n", phy, reg);
-
-       return;
 }
 
 static inline void
@@ -130,8 +128,6 @@ jme_reset_phy_processor(struct jme_adapter *jme)
        jme_mdio_write(jme->dev,
                        jme->mii_if.phy_id,
                        MII_BMCR, val | BMCR_RESET);
-
-       return;
 }
 
 static void
@@ -967,7 +963,11 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
                        skb->ip_summed = CHECKSUM_NONE;
+#else
+                       skb_checksum_none_assert(skb);
+#endif
 
                if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
                        if (jme->vlgrp) {
@@ -3062,7 +3062,7 @@ jme_init_one(struct pci_dev *pdev,
        default:
                jme->reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_512B;
                break;
-       };
+       }
 
        /*
         * Must check before reset_mac_processor