Fix version.h include order

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index 8f1e931b22eead03b8816daa7365868315260e48..be1809cfe25941a6432cfdc63eb8a7923ec4ccee 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
@@ -103,8 +104,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 +129,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 +964,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) {
@@ -2122,7 +2123,11 @@ jme_set_multi(struct net_device *netdev)
        } else if (netdev->flags & IFF_ALLMULTI) {
                jme->reg_rxmcs |= RXMCS_ALLMULFRAME;
        } else if (netdev->flags & IFF_MULTICAST) {
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
                struct dev_mc_list *mclist;
+#else
+               struct netdev_hw_addr *ha;
+#endif
                int bit_nr;
 
                jme->reg_rxmcs |= RXMCS_MULFRAME | RXMCS_MULFILTERED;
@@ -2130,10 +2135,16 @@ jme_set_multi(struct net_device *netdev)
                for (i = 0, mclist = netdev->mc_list;
                        mclist && i < netdev->mc_count;
                        ++i, mclist = mclist->next) {
-#else
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
                netdev_for_each_mc_addr(mclist, netdev) {
+#else
+               netdev_for_each_mc_addr(ha, netdev) {
 #endif
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
                        bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3F;
+#else
+                       bit_nr = ether_crc(ETH_ALEN, ha->addr) & 0x3F;
+#endif
                        mc_hash[bit_nr >> 5] |= 1 << (bit_nr & 0x1F);
                }
 
@@ -3052,7 +3063,7 @@ jme_init_one(struct pci_dev *pdev,
        default:
                jme->reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_512B;
                break;
-       };
+       }
 
        /*
         * Must check before reset_mac_processor