Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / igb / igb_main.c

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 6e5861b..4f05f6e 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -38,12 +38,6 @@
 #include <linux/i2c.h>
 #include "igb.h"
 
-#define MAJ 5
-#define MIN 6
-#define BUILD 0
-#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
-__stringify(BUILD) "-k"
-
 enum queue_mode {
        QUEUE_MODE_STRICT_PRIORITY,
        QUEUE_MODE_STREAM_RESERVATION,
@@ -55,7 +49,6 @@ enum tx_queue_prio {
 };
 
 char igb_driver_name[] = "igb";
-char igb_driver_version[] = DRV_VERSION;
 static const char igb_driver_string[] =
                                "Intel(R) Gigabit Ethernet Network Driver";
 static const char igb_copyright[] =
@@ -240,7 +233,6 @@ static struct pci_driver igb_driver = {
 MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
 MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION(DRV_VERSION);
 
 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
 static int debug = -1;
@@ -666,8 +658,7 @@ static int __init igb_init_module(void)
 {
        int ret;
 
-       pr_info("%s - version %s\n",
-              igb_driver_string, igb_driver_version);
+       pr_info("%s\n", igb_driver_string);
        pr_info("%s\n", igb_copyright);
 
 #ifdef CONFIG_IGB_DCA
@@ -720,14 +711,14 @@ static void igb_cache_ring_register(struct igb_adapter *adapter)
                                adapter->rx_ring[i]->reg_idx = rbase_offset +
                                                               Q_IDX_82576(i);
                }
-               /* Fall through */
+               fallthrough;
        case e1000_82575:
        case e1000_82580:
        case e1000_i350:
        case e1000_i354:
        case e1000_i210:
        case e1000_i211:
-               /* Fall through */
+               fallthrough;
        default:
                for (; i < adapter->num_rx_queues; i++)
                        adapter->rx_ring[i]->reg_idx = rbase_offset + i;
@@ -2882,7 +2873,7 @@ void igb_set_fw_version(struct igb_adapter *adapter)
                                 fw.invm_img_type);
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
                /* if option is rom valid, display its version too */
                if (fw.or_valid) {
@@ -3733,13 +3724,13 @@ unsigned int igb_get_max_rss_queues(struct igb_adapter *adapter)
                        max_rss_queues = 1;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case e1000_82576:
                if (!!adapter->vfs_allocated_count) {
                        max_rss_queues = 2;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case e1000_82580:
        case e1000_i354:
        default:
@@ -4878,14 +4869,14 @@ static int igb_vlan_promisc_enable(struct igb_adapter *adapter)
                /* VLAN filtering needed for VLAN prio filter */
                if (adapter->netdev->features & NETIF_F_NTUPLE)
                        break;
-               /* fall through */
+               fallthrough;
        case e1000_82576:
        case e1000_82580:
        case e1000_i354:
                /* VLAN filtering needed for pool filtering */
                if (adapter->vfs_allocated_count)
                        break;
-               /* fall through */
+               fallthrough;
        default:
                return 1;
        }
@@ -5165,7 +5156,7 @@ bool igb_has_link(struct igb_adapter *adapter)
        case e1000_media_type_copper:
                if (!hw->mac.get_link_status)
                        return true;
-               /* fall through */
+               fallthrough;
        case e1000_media_type_internal_serdes:
                hw->mac.ops.check_for_link(hw);
                link_active = !hw->mac.get_link_status;
@@ -5825,7 +5816,7 @@ csum_failed:
        switch (skb->csum_offset) {
        case offsetof(struct tcphdr, check):
                type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP;
-               /* fall through */
+               fallthrough;
        case offsetof(struct udphdr, check):
                break;
        case offsetof(struct sctphdr, checksum):
@@ -5837,7 +5828,7 @@ csum_failed:
                        type_tucmd = E1000_ADVTXD_TUCMD_L4T_SCTP;
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
                skb_checksum_help(skb);
                goto csum_failed;
@@ -6724,7 +6715,7 @@ static int __igb_notify_dca(struct device *dev, void *data)
                        igb_setup_dca(adapter);
                        break;
                }
-               /* Fall Through - since DCA is disabled. */
+               fallthrough; /* since DCA is disabled. */
        case DCA_PROVIDER_REMOVE:
                if (adapter->flags & IGB_FLAG_DCA_ENABLED) {
                        /* without this a class_device is left
@@ -7177,7 +7168,7 @@ static void igb_flush_mac_table(struct igb_adapter *adapter)
 
        for (i = 0; i < hw->mac.rar_entry_count; i++) {
                adapter->mac_table[i].state &= ~IGB_MAC_STATE_IN_USE;
-               memset(adapter->mac_table[i].addr, 0, ETH_ALEN);
+               eth_zero_addr(adapter->mac_table[i].addr);
                adapter->mac_table[i].queue = 0;
                igb_rar_set_index(adapter, i);
        }
@@ -7326,7 +7317,7 @@ static int igb_del_mac_filter_flags(struct igb_adapter *adapter,
                } else {
                        adapter->mac_table[i].state = 0;
                        adapter->mac_table[i].queue = 0;
-                       memset(adapter->mac_table[i].addr, 0, ETH_ALEN);
+                       eth_zero_addr(adapter->mac_table[i].addr);
                }
 
                igb_rar_set_index(adapter, i);
@@ -9393,13 +9384,13 @@ static void igb_vmm_control(struct igb_adapter *adapter)
                reg = rd32(E1000_DTXCTL);
                reg |= E1000_DTXCTL_VLAN_ADDED;
                wr32(E1000_DTXCTL, reg);
-               /* Fall through */
+               fallthrough;
        case e1000_82580:
                /* enable replication vlan tag stripping */
                reg = rd32(E1000_RPLOLR);
                reg |= E1000_RPLOLR_STRVLAN;
                wr32(E1000_RPLOLR, reg);
-               /* Fall through */
+               fallthrough;
        case e1000_i350:
                /* none of the above registers are supported by i350 */
                break;