Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

6 files changed, 142 insertions, 145 deletions

diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 521c0c732998..49e8408f05fc 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -149,7 +149,7 @@ struct ixgb_desc_ring {
 
 struct ixgb_adapter {
         struct timer_list watchdog_timer;
-        struct vlan_group *vlgrp;
+        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
         u32 bd_number;
         u32 rx_buffer_len;
         u32 part_num;
@@ -157,9 +157,6 @@ struct ixgb_adapter {
         u16 link_duplex;
         struct work_struct tx_timeout_task;
 
-        struct timer_list blink_timer;
-        unsigned long led_status;
-
         /* TX */
         struct ixgb_desc_ring tx_ring ____cacheline_aligned_in_smp;
         unsigned int restart_queue;
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c
index 813993f9c65c..c982ab9f9005 100644
--- a/drivers/net/ixgb/ixgb_ee.c
+++ b/drivers/net/ixgb/ixgb_ee.c
@@ -296,12 +296,12 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw)
                 eecd_reg = IXGB_READ_REG(hw, EECD);
 
                 if (eecd_reg & IXGB_EECD_DO)
-                        return (true);
+                        return true;
 
                 udelay(50);
         }
         ASSERT(0);
-        return (false);
+        return false;
 }
 
 /******************************************************************************
@@ -327,9 +327,9 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw)
                 checksum += ixgb_read_eeprom(hw, i);
 
         if (checksum == (u16) EEPROM_SUM)
-                return (true);
+                return true;
         else
-                return (false);
+                return false;
 }
 
 /******************************************************************************
@@ -439,7 +439,7 @@ ixgb_read_eeprom(struct ixgb_hw *hw,
         /*  End this read operation  */
         ixgb_standby_eeprom(hw);
 
-        return (data);
+        return data;
 }
 
 /******************************************************************************
@@ -476,16 +476,16 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw)
                 /* clear the init_ctrl_reg_1 to signify that the cache is
                  * invalidated */
                 ee_map->init_ctrl_reg_1 = cpu_to_le16(EEPROM_ICW1_SIGNATURE_CLEAR);
-                return (false);
+                return false;
         }
 
         if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
                  != cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
                 pr_debug("Signature invalid\n");
-                return(false);
+                return false;
         }
 
-        return(true);
+        return true;
 }
 
 /******************************************************************************
@@ -505,7 +505,7 @@ ixgb_check_and_get_eeprom_data (struct ixgb_hw* hw)
 
         if ((ee_map->init_ctrl_reg_1 & cpu_to_le16(EEPROM_ICW1_SIGNATURE_MASK))
             == cpu_to_le16(EEPROM_ICW1_SIGNATURE_VALID)) {
-                return (true);
+                return true;
         } else {
                 return ixgb_get_eeprom_data(hw);
         }
@@ -526,10 +526,10 @@ ixgb_get_eeprom_word(struct ixgb_hw *hw, u16 index)
 
         if ((index < IXGB_EEPROM_SIZE) &&
                 (ixgb_check_and_get_eeprom_data(hw) == true)) {
-           return(hw->eeprom[index]);
+           return hw->eeprom[index];
         }
 
-        return(0);
+        return 0;
 }
 
 /******************************************************************************
@@ -570,10 +570,10 @@ u32
 ixgb_get_ee_pba_number(struct ixgb_hw *hw)
 {
         if (ixgb_check_and_get_eeprom_data(hw) == true)
-                return (le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
-                        | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16));
+                return le16_to_cpu(hw->eeprom[EEPROM_PBA_1_2_REG])
+                        | (le16_to_cpu(hw->eeprom[EEPROM_PBA_3_4_REG])<<16);
 
-        return(0);
+        return 0;
 }
 
 
@@ -591,8 +591,8 @@ ixgb_get_ee_device_id(struct ixgb_hw *hw)
         struct ixgb_ee_map_type *ee_map = (struct ixgb_ee_map_type *)hw->eeprom;
 
         if (ixgb_check_and_get_eeprom_data(hw) == true)
-                return (le16_to_cpu(ee_map->device_id));
+                return le16_to_cpu(ee_map->device_id);
 
-        return (0);
+        return 0;
 }
 
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index a4ed96caae69..6da890b9534c 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -104,10 +104,10 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
         ecmd->transceiver = XCVR_EXTERNAL;
 
         if (netif_carrier_ok(adapter->netdev)) {
-                ecmd->speed = SPEED_10000;
+                ethtool_cmd_speed_set(ecmd, SPEED_10000);
                 ecmd->duplex = DUPLEX_FULL;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -129,9 +129,10 @@ static int
 ixgb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
+        u32 speed = ethtool_cmd_speed(ecmd);
 
         if (ecmd->autoneg == AUTONEG_ENABLE ||
-           ecmd->speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL)
+            (speed + ecmd->duplex != SPEED_10000 + DUPLEX_FULL))
                 return -EINVAL;
 
         if (netif_running(adapter->netdev)) {
@@ -410,7 +411,7 @@ static int
 ixgb_get_eeprom_len(struct net_device *netdev)
 {
         /* return size in bytes */
-        return (IXGB_EEPROM_SIZE << 1);
+        return IXGB_EEPROM_SIZE << 1;
 }
 
 static int
@@ -610,45 +611,23 @@ err_setup_rx:
         return err;
 }
 
-/* toggle LED 4 times per second = 2 "blinks" per second */
-#define IXGB_ID_INTERVAL        (HZ/4)
-
-/* bit defines for adapter->led_status */
-#define IXGB_LED_ON             0
-
-static void
-ixgb_led_blink_callback(unsigned long data)
-{
-        struct ixgb_adapter *adapter = (struct ixgb_adapter *)data;
-
-        if (test_and_change_bit(IXGB_LED_ON, &adapter->led_status))
-                ixgb_led_off(&adapter->hw);
-        else
-                ixgb_led_on(&adapter->hw);
-
-        mod_timer(&adapter->blink_timer, jiffies + IXGB_ID_INTERVAL);
-}
-
 static int
-ixgb_phys_id(struct net_device *netdev, u32 data)
+ixgb_set_phys_id(struct net_device *netdev, enum ethtool_phys_id_state state)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
-        if (!data)
-                data = INT_MAX;
-
-        if (!adapter->blink_timer.function) {
-                init_timer(&adapter->blink_timer);
-                adapter->blink_timer.function = ixgb_led_blink_callback;
-                adapter->blink_timer.data = (unsigned long)adapter;
-        }
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                return 2;
 
-        mod_timer(&adapter->blink_timer, jiffies);
+        case ETHTOOL_ID_ON:
+                ixgb_led_on(&adapter->hw);
+                break;
 
-        msleep_interruptible(data * 1000);
-        del_timer_sync(&adapter->blink_timer);
-        ixgb_led_off(&adapter->hw);
-        clear_bit(IXGB_LED_ON, &adapter->led_status);
+        case ETHTOOL_ID_OFF:
+        case ETHTOOL_ID_INACTIVE:
+                ixgb_led_off(&adapter->hw);
+        }
 
         return 0;
 }
@@ -706,6 +685,43 @@ ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
         }
 }
 
+static int ixgb_set_flags(struct net_device *netdev, u32 data)
+{
+        struct ixgb_adapter *adapter = netdev_priv(netdev);
+        bool need_reset;
+        int rc;
+
+        /*
+         * Tx VLAN insertion does not work per HW design when Rx stripping is
+         * disabled.  Disable txvlan when rxvlan is turned off, and enable
+         * rxvlan when txvlan is turned on.
+         */
+        if (!(data & ETH_FLAG_RXVLAN) &&
+            (netdev->features & NETIF_F_HW_VLAN_TX))
+                data &= ~ETH_FLAG_TXVLAN;
+        else if (data & ETH_FLAG_TXVLAN)
+                data |= ETH_FLAG_RXVLAN;
+
+        need_reset = (data & ETH_FLAG_RXVLAN) !=
+                     (netdev->features & NETIF_F_HW_VLAN_RX);
+
+        rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
+                                                ETH_FLAG_TXVLAN);
+        if (rc)
+                return rc;
+
+        if (need_reset) {
+                if (netif_running(netdev)) {
+                        ixgb_down(adapter, true);
+                        ixgb_up(adapter);
+                        ixgb_set_speed_duplex(netdev);
+                } else
+                        ixgb_reset(adapter);
+        }
+
+        return 0;
+}
+
 static const struct ethtool_ops ixgb_ethtool_ops = {
         .get_settings = ixgb_get_settings,
         .set_settings = ixgb_set_settings,
@@ -729,9 +745,11 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
         .set_msglevel = ixgb_set_msglevel,
         .set_tso = ixgb_set_tso,
         .get_strings = ixgb_get_strings,
-        .phys_id = ixgb_phys_id,
+        .set_phys_id = ixgb_set_phys_id,
         .get_sset_count = ixgb_get_sset_count,
         .get_ethtool_stats = ixgb_get_ethtool_stats,
+        .get_flags = ethtool_op_get_flags,
+        .set_flags = ixgb_set_flags,
 };
 
 void ixgb_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 397acabccab6..6cb2e42ff4c1 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -167,7 +167,7 @@ ixgb_adapter_stop(struct ixgb_hw *hw)
         /* Clear any pending interrupt events. */
         icr_reg = IXGB_READ_REG(hw, ICR);
 
-        return (ctrl_reg & IXGB_CTRL0_RST);
+        return ctrl_reg & IXGB_CTRL0_RST;
 }
 
 
@@ -209,7 +209,7 @@ ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
                 xpak_vendor = ixgb_xpak_vendor_infineon;
         }
 
-        return (xpak_vendor);
+        return xpak_vendor;
 }
 
 /******************************************************************************
@@ -273,7 +273,7 @@ ixgb_identify_phy(struct ixgb_hw *hw)
         if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
                 phy_type = ixgb_phy_type_bcm;
 
-        return (phy_type);
+        return phy_type;
 }
 
 /******************************************************************************
@@ -366,7 +366,7 @@ ixgb_init_hw(struct ixgb_hw *hw)
         /* 82597EX errata: Call check-for-link in case lane deskew is locked */
         ixgb_check_for_link(hw);
 
-        return (status);
+        return status;
 }
 
 /******************************************************************************
@@ -531,7 +531,7 @@ ixgb_hash_mc_addr(struct ixgb_hw *hw,
         }
 
         hash_value &= 0xFFF;
-        return (hash_value);
+        return hash_value;
 }
 
 /******************************************************************************
@@ -715,7 +715,7 @@ ixgb_setup_fc(struct ixgb_hw *hw)
                 }
                 IXGB_WRITE_REG(hw, FCRTH, hw->fc.high_water);
         }
-        return (status);
+        return status;
 }
 
 /******************************************************************************
@@ -1140,7 +1140,7 @@ mac_addr_valid(u8 *mac_addr)
                 pr_debug("MAC address is all zeros\n");
                 is_valid = false;
         }
-        return (is_valid);
+        return is_valid;
 }
 
 /******************************************************************************
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 45fc89b9ba64..6a130eb51cfa 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -28,6 +28,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/prefetch.h>
 #include "ixgb.h"
 
 char ixgb_driver_name[] = "ixgb";
@@ -98,8 +99,8 @@ static void ixgb_alloc_rx_buffers(struct ixgb_adapter *, int);
 static void ixgb_tx_timeout(struct net_device *dev);
 static void ixgb_tx_timeout_task(struct work_struct *work);
 
-static void ixgb_vlan_rx_register(struct net_device *netdev,
-                                  struct vlan_group *grp);
+static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
+static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
 static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
 static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
@@ -334,7 +335,6 @@ static const struct net_device_ops ixgb_netdev_ops = {
         .ndo_set_mac_address    = ixgb_set_mac,
         .ndo_change_mtu         = ixgb_change_mtu,
         .ndo_tx_timeout         = ixgb_tx_timeout,
-        .ndo_vlan_rx_register   = ixgb_vlan_rx_register,
         .ndo_vlan_rx_add_vid    = ixgb_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = ixgb_vlan_rx_kill_vid,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -446,8 +446,10 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                            NETIF_F_HW_VLAN_FILTER;
         netdev->features |= NETIF_F_TSO;
 
-        if (pci_using_dac)
+        if (pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
+                netdev->vlan_features |= NETIF_F_HIGHDMA;
+        }
 
         /* make sure the EEPROM is good */
 
@@ -470,7 +472,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->part_num = ixgb_get_ee_pba_number(&adapter->hw);
 
         init_timer(&adapter->watchdog_timer);
-        adapter->watchdog_timer.function = &ixgb_watchdog;
+        adapter->watchdog_timer.function = ixgb_watchdog;
         adapter->watchdog_timer.data = (unsigned long)adapter;
 
         INIT_WORK(&adapter->tx_timeout_task, ixgb_tx_timeout_task);
@@ -523,7 +525,7 @@ ixgb_remove(struct pci_dev *pdev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->tx_timeout_task);
 
         unregister_netdev(netdev);
 
@@ -531,6 +533,7 @@ ixgb_remove(struct pci_dev *pdev)
         pci_release_regions(pdev);
 
         free_netdev(netdev);
+        pci_disable_device(pdev);
 }
 
 /**
@@ -666,13 +669,12 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         int size;
 
         size = sizeof(struct ixgb_buffer) * txdr->count;
-        txdr->buffer_info = vmalloc(size);
+        txdr->buffer_info = vzalloc(size);
         if (!txdr->buffer_info) {
                 netif_err(adapter, probe, adapter->netdev,
                           "Unable to allocate transmit descriptor ring memory\n");
                 return -ENOMEM;
         }
-        memset(txdr->buffer_info, 0, size);
 
         /* round up to nearest 4K */
 
@@ -756,13 +758,12 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
         int size;
 
         size = sizeof(struct ixgb_buffer) * rxdr->count;
-        rxdr->buffer_info = vmalloc(size);
+        rxdr->buffer_info = vzalloc(size);
         if (!rxdr->buffer_info) {
                 netif_err(adapter, probe, adapter->netdev,
                           "Unable to allocate receive descriptor ring\n");
                 return -ENOMEM;
         }
-        memset(rxdr->buffer_info, 0, size);
 
         /* Round up to nearest 4K */
 
@@ -1075,6 +1076,8 @@ ixgb_set_multi(struct net_device *netdev)
 
         if (netdev->flags & IFF_PROMISC) {
                 rctl |= (IXGB_RCTL_UPE | IXGB_RCTL_MPE);
+                /* disable VLAN filtering */
+                rctl &= ~IXGB_RCTL_CFIEN;
                 rctl &= ~IXGB_RCTL_VFE;
         } else {
                 if (netdev->flags & IFF_ALLMULTI) {
@@ -1083,7 +1086,9 @@ ixgb_set_multi(struct net_device *netdev)
                 } else {
                         rctl &= ~(IXGB_RCTL_UPE | IXGB_RCTL_MPE);
                 }
+                /* enable VLAN filtering */
                 rctl |= IXGB_RCTL_VFE;
+                rctl &= ~IXGB_RCTL_CFIEN;
         }
 
         if (netdev_mc_count(netdev) > IXGB_MAX_NUM_MULTICAST_ADDRESSES) {
@@ -1102,6 +1107,12 @@ ixgb_set_multi(struct net_device *netdev)
 
                 ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0);
         }
+
+        if (netdev->features & NETIF_F_HW_VLAN_RX)
+                ixgb_vlan_strip_enable(adapter);
+        else
+                ixgb_vlan_strip_disable(adapter);
+
 }
 
 /**
@@ -1249,7 +1260,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
 
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 struct ixgb_buffer *buffer_info;
-                css = skb_transport_offset(skb);
+                css = skb_checksum_start_offset(skb);
                 cso = css + skb->csum_offset;
 
                 i = adapter->tx_ring.next_to_use;
@@ -1495,7 +1506,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                      DESC_NEEDED)))
                 return NETDEV_TX_BUSY;
 
-        if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 tx_flags |= IXGB_TX_FLAGS_VLAN;
                 vlan_id = vlan_tx_tag_get(skb);
         }
@@ -1905,7 +1916,7 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
          */
         if ((rx_desc->status & IXGB_RX_DESC_STATUS_IXSM) ||
            (!(rx_desc->status & IXGB_RX_DESC_STATUS_TCPCS))) {
-                skb->ip_summed = CHECKSUM_NONE;
+                skb_checksum_none_assert(skb);
                 return;
         }
 
@@ -1913,7 +1924,7 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
         /* now look at the TCP checksum error bit */
         if (rx_desc->errors & IXGB_RX_DESC_ERRORS_TCPE) {
                 /* let the stack verify checksum errors */
-                skb->ip_summed = CHECKSUM_NONE;
+                skb_checksum_none_assert(skb);
                 adapter->hw_csum_rx_error++;
         } else {
                 /* TCP checksum is good */
@@ -2036,12 +2047,11 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
                 ixgb_rx_checksum(adapter, rx_desc, skb);
 
                 skb->protocol = eth_type_trans(skb, netdev);
-                if (adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) {
-                        vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-                                                le16_to_cpu(rx_desc->special));
-                } else {
-                        netif_receive_skb(skb);
-                }
+                if (status & IXGB_RX_DESC_STATUS_VP)
+                        __vlan_hwaccel_put_tag(skb,
+                                               le16_to_cpu(rx_desc->special));
+
+                netif_receive_skb(skb);
 
 rxdesc_done:
                 /* clean up descriptor, might be written over by hw */
@@ -2139,43 +2149,26 @@ map_skb:
         }
 }
 
-/**
- * ixgb_vlan_rx_register - enables or disables vlan tagging/stripping.
- *
- * @param netdev network interface device structure
- * @param grp indicates to enable or disable tagging/stripping
- **/
 static void
-ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
+ixgb_vlan_strip_enable(struct ixgb_adapter *adapter)
 {
-        struct ixgb_adapter *adapter = netdev_priv(netdev);
-        u32 ctrl, rctl;
-
-        ixgb_irq_disable(adapter);
-        adapter->vlgrp = grp;
+        u32 ctrl;
 
-        if (grp) {
-                /* enable VLAN tag insert/strip */
-                ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
-                ctrl |= IXGB_CTRL0_VME;
-                IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-
-                /* enable VLAN receive filtering */
-
-                rctl = IXGB_READ_REG(&adapter->hw, RCTL);
-                rctl &= ~IXGB_RCTL_CFIEN;
-                IXGB_WRITE_REG(&adapter->hw, RCTL, rctl);
-        } else {
-                /* disable VLAN tag insert/strip */
+        /* enable VLAN tag insert/strip */
+        ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+        ctrl |= IXGB_CTRL0_VME;
+        IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
+}
 
-                ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
-                ctrl &= ~IXGB_CTRL0_VME;
-                IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
-        }
+static void
+ixgb_vlan_strip_disable(struct ixgb_adapter *adapter)
+{
+        u32 ctrl;
 
-        /* don't enable interrupts unless we are UP */
-        if (adapter->netdev->flags & IFF_UP)
-                ixgb_irq_enable(adapter);
+        /* disable VLAN tag insert/strip */
+        ctrl = IXGB_READ_REG(&adapter->hw, CTRL0);
+        ctrl &= ~IXGB_CTRL0_VME;
+        IXGB_WRITE_REG(&adapter->hw, CTRL0, ctrl);
 }
 
 static void
@@ -2190,6 +2183,7 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
         vfta |= (1 << (vid & 0x1F));
         ixgb_write_vfta(&adapter->hw, index, vfta);
+        set_bit(vid, adapter->active_vlans);
 }
 
 static void
@@ -2198,35 +2192,22 @@ ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         u32 vfta, index;
 
-        ixgb_irq_disable(adapter);
-
-        vlan_group_set_device(adapter->vlgrp, vid, NULL);
-
-        /* don't enable interrupts unless we are UP */
-        if (adapter->netdev->flags & IFF_UP)
-                ixgb_irq_enable(adapter);
-
         /* remove VID from filter table */
 
         index = (vid >> 5) & 0x7F;
         vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
         vfta &= ~(1 << (vid & 0x1F));
         ixgb_write_vfta(&adapter->hw, index, vfta);
+        clear_bit(vid, adapter->active_vlans);
 }
 
 static void
 ixgb_restore_vlan(struct ixgb_adapter *adapter)
 {
-        ixgb_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-
-        if (adapter->vlgrp) {
-                u16 vid;
-                for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
-                        if (!vlan_group_get_device(adapter->vlgrp, vid))
-                                continue;
-                        ixgb_vlan_rx_add_vid(adapter->netdev, vid);
-                }
-        }
+        u16 vid;
+
+        for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+                ixgb_vlan_rx_add_vid(adapter->netdev, vid);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index 88a08f056241..dd7fbeb1f7d1 100644
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -191,9 +191,9 @@ struct ixgb_option {
                 } r;
                 struct {        /* list_option info */
                         int nr;
-                        struct ixgb_opt_list {
+                        const struct ixgb_opt_list {
                                 int i;
-                                char *str;
+                                const char *str;
                         } *p;
                 } l;
         } arg;
@@ -226,7 +226,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
                 break;
         case list_option: {
                 int i;
-                struct ixgb_opt_list *ent;
+                const struct ixgb_opt_list *ent;
 
                 for (i = 0; i < opt->arg.l.nr; i++) {
                         ent = &opt->arg.l.p[i];
@@ -322,14 +322,15 @@ ixgb_check_options(struct ixgb_adapter *adapter)
         }
         { /* Flow Control */
 
-                struct ixgb_opt_list fc_list[] =
-                        {{ ixgb_fc_none,        "Flow Control Disabled" },
-                         { ixgb_fc_rx_pause,"Flow Control Receive Only" },
-                         { ixgb_fc_tx_pause,"Flow Control Transmit Only" },
-                         { ixgb_fc_full,        "Flow Control Enabled" },
-                         { ixgb_fc_default, "Flow Control Hardware Default" }};
+                static const struct ixgb_opt_list fc_list[] = {
+                       { ixgb_fc_none, "Flow Control Disabled" },
+                       { ixgb_fc_rx_pause, "Flow Control Receive Only" },
+                       { ixgb_fc_tx_pause, "Flow Control Transmit Only" },
+                       { ixgb_fc_full, "Flow Control Enabled" },
+                       { ixgb_fc_default, "Flow Control Hardware Default" }
+                };
 
-                const struct ixgb_option opt = {
+                static const struct ixgb_option opt = {
                         .type = list_option,
                         .name = "Flow Control",
                         .err  = "reading default settings from EEPROM",