11 files changed, 175 insertions, 320 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index e4f42257c24c..b7544336cef4 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -1498,7 +1498,6 @@ struct e1000_info e1000_es2_info = {
                                   | FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_RX_NEEDS_RESTART /* errata */
                                   | FLAG_TARC_SET_BIT_ZERO /* errata */
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 536b3a55c45f..2d4dc53a4fb8 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -2019,7 +2019,6 @@ struct e1000_info e1000_82571_info = {
                                   | FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_SMART_POWER_DOWN
                                   | FLAG_RESET_OVERWRITES_LAA /* errata */
@@ -2041,7 +2040,6 @@ struct e1000_info e1000_82572_info = {
                                   | FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_TARC_SPEED_MODE_BIT, /* errata */
         .flags2                 = FLAG2_DISABLE_ASPM_L1 /* errata 13 */
@@ -2059,7 +2057,6 @@ struct e1000_info e1000_82573_info = {
         .flags                  = FLAG_HAS_HW_VLAN_FILTER
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_SMART_POWER_DOWN
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_SWSM_ON_LOAD,
@@ -2080,7 +2077,6 @@ struct e1000_info e1000_82574_info = {
                                   | FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_SMART_POWER_DOWN
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_CTRLEXT_ON_LOAD,
@@ -2100,7 +2096,6 @@ struct e1000_info e1000_82583_info = {
         .flags                  = FLAG_HAS_HW_VLAN_FILTER
                                   | FLAG_HAS_WOL
                                   | FLAG_APME_IN_CTRL3
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_SMART_POWER_DOWN
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_JUMBO_FRAMES
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index fa72052a0031..1b15d1ff583c 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -440,12 +440,11 @@ struct e1000_info {
 #define FLAG_LSC_GIG_SPEED_DROP           (1 << 25)
 #define FLAG_SMART_POWER_DOWN             (1 << 26)
 #define FLAG_MSI_ENABLED                  (1 << 27)
-#define FLAG_RX_CSUM_ENABLED              (1 << 28)
+/* reserved (1 << 28) */
 #define FLAG_TSO_FORCE                    (1 << 29)
 #define FLAG_RX_RESTART_NOW               (1 << 30)
 #define FLAG_MSI_TEST_FAILED              (1 << 31)
 
-/* CRC Stripping defines */
 #define FLAG2_CRC_STRIPPING               (1 << 0)
 #define FLAG2_HAS_PHY_WAKEUP              (1 << 1)
 #define FLAG2_IS_DISCARDING               (1 << 2)
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index e0cbd6a0bde8..d96d0b0e08cf 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -367,59 +367,6 @@ out:
         return retval;
 }
 
-static u32 e1000_get_rx_csum(struct net_device *netdev)
-{
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-        return adapter->flags & FLAG_RX_CSUM_ENABLED;
-}
-
-static int e1000_set_rx_csum(struct net_device *netdev, u32 data)
-{
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-
-        if (data)
-                adapter->flags |= FLAG_RX_CSUM_ENABLED;
-        else
-                adapter->flags &= ~FLAG_RX_CSUM_ENABLED;
-
-        if (netif_running(netdev))
-                e1000e_reinit_locked(adapter);
-        else
-                e1000e_reset(adapter);
-        return 0;
-}
-
-static u32 e1000_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int e1000_set_tx_csum(struct net_device *netdev, u32 data)
-{
-        if (data)
-                netdev->features |= NETIF_F_HW_CSUM;
-        else
-                netdev->features &= ~NETIF_F_HW_CSUM;
-
-        return 0;
-}
-
-static int e1000_set_tso(struct net_device *netdev, u32 data)
-{
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-
-        if (data) {
-                netdev->features |= NETIF_F_TSO;
-                netdev->features |= NETIF_F_TSO6;
-        } else {
-                netdev->features &= ~NETIF_F_TSO;
-                netdev->features &= ~NETIF_F_TSO6;
-        }
-
-        adapter->flags |= FLAG_TSO_FORCE;
-        return 0;
-}
-
 static u32 e1000_get_msglevel(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -2014,31 +1961,6 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
         }
 }
 
-static int e1000e_set_flags(struct net_device *netdev, u32 data)
-{
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-        bool need_reset = false;
-        int rc;
-
-        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))
-                        e1000e_reinit_locked(adapter);
-                else
-                        e1000e_reset(adapter);
-        }
-
-        return 0;
-}
-
 static const struct ethtool_ops e1000_ethtool_ops = {
         .get_settings           = e1000_get_settings,
         .set_settings           = e1000_set_settings,
@@ -2058,14 +1980,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .set_ringparam          = e1000_set_ringparam,
         .get_pauseparam         = e1000_get_pauseparam,
         .set_pauseparam         = e1000_set_pauseparam,
-        .get_rx_csum            = e1000_get_rx_csum,
-        .set_rx_csum            = e1000_set_rx_csum,
-        .get_tx_csum            = e1000_get_tx_csum,
-        .set_tx_csum            = e1000_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
-        .set_tso                = e1000_set_tso,
         .self_test              = e1000_diag_test,
         .get_strings            = e1000_get_strings,
         .set_phys_id            = e1000_set_phys_id,
@@ -2073,8 +1987,6 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .get_sset_count         = e1000e_get_sset_count,
         .get_coalesce           = e1000_get_coalesce,
         .set_coalesce           = e1000_set_coalesce,
-        .get_flags              = ethtool_op_get_flags,
-        .set_flags              = e1000e_set_flags,
 };
 
 void e1000e_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 54add27c8f76..3fc3acce9950 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -4058,7 +4058,6 @@ struct e1000_info e1000_ich8_info = {
         .mac                    = e1000_ich8lan,
         .flags                  = FLAG_HAS_WOL
                                   | FLAG_IS_ICH
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_FLASH
@@ -4076,7 +4075,6 @@ struct e1000_info e1000_ich9_info = {
         .flags                  = FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_IS_ICH
                                   | FLAG_HAS_WOL
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_ERT
@@ -4095,7 +4093,6 @@ struct e1000_info e1000_ich10_info = {
         .flags                  = FLAG_HAS_JUMBO_FRAMES
                                   | FLAG_IS_ICH
                                   | FLAG_HAS_WOL
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_ERT
@@ -4113,7 +4110,6 @@ struct e1000_info e1000_pch_info = {
         .mac                    = e1000_pchlan,
         .flags                  = FLAG_IS_ICH
                                   | FLAG_HAS_WOL
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_FLASH
@@ -4133,7 +4129,6 @@ struct e1000_info e1000_pch2_info = {
         .mac                    = e1000_pch2lan,
         .flags                  = FLAG_IS_ICH
                                   | FLAG_HAS_WOL
-                                  | FLAG_RX_CSUM_ENABLED
                                   | FLAG_HAS_CTRLEXT_ON_LOAD
                                   | FLAG_HAS_AMT
                                   | FLAG_HAS_FLASH
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 9742bc603cad..4f669995623f 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3069,7 +3069,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
 
         /* Enable Receive Checksum Offload for TCP and UDP */
         rxcsum = er32(RXCSUM);
-        if (adapter->flags & FLAG_RX_CSUM_ENABLED) {
+        if (adapter->netdev->features & NETIF_F_RXCSUM) {
                 rxcsum |= E1000_RXCSUM_TUOFL;
 
                 /*
@@ -5860,6 +5860,26 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
         }
 }
 
+static int e1000_set_features(struct net_device *netdev, u32 features)
+{
+        struct e1000_adapter *adapter = netdev_priv(netdev);
+        u32 changed = features ^ netdev->features;
+
+        if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
+                adapter->flags |= FLAG_TSO_FORCE;
+
+        if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
+                         NETIF_F_RXCSUM)))
+                return 0;
+
+        if (netif_running(netdev))
+                e1000e_reinit_locked(adapter);
+        else
+                e1000e_reset(adapter);
+
+        return 0;
+}
+
 static const struct net_device_ops e1000e_netdev_ops = {
         .ndo_open               = e1000_open,
         .ndo_stop               = e1000_close,
@@ -5877,6 +5897,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = e1000_netpoll,
 #endif
+        .ndo_set_features = e1000_set_features,
 };
 
 /**
@@ -6036,21 +6057,25 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (e1000_check_reset_block(&adapter->hw))
                 e_info("PHY reset is blocked due to SOL/IDER session.\n");
 
-        netdev->features = NETIF_F_SG |
-                           NETIF_F_HW_CSUM |
-                           NETIF_F_HW_VLAN_TX |
-                           NETIF_F_HW_VLAN_RX;
+        /* Set initial default active device features */
+        netdev->features = (NETIF_F_SG |
+                            NETIF_F_HW_VLAN_RX |
+                            NETIF_F_HW_VLAN_TX |
+                            NETIF_F_TSO |
+                            NETIF_F_TSO6 |
+                            NETIF_F_RXCSUM |
+                            NETIF_F_HW_CSUM);
+
+        /* Set user-changeable features (subset of all device features) */
+        netdev->hw_features = netdev->features;
 
         if (adapter->flags & FLAG_HAS_HW_VLAN_FILTER)
                 netdev->features |= NETIF_F_HW_VLAN_FILTER;
 
-        netdev->features |= NETIF_F_TSO;
-        netdev->features |= NETIF_F_TSO6;
-
-        netdev->vlan_features |= NETIF_F_TSO;
-        netdev->vlan_features |= NETIF_F_TSO6;
-        netdev->vlan_features |= NETIF_F_HW_CSUM;
-        netdev->vlan_features |= NETIF_F_SG;
+        netdev->vlan_features |= (NETIF_F_SG |
+                                  NETIF_F_TSO |
+                                  NETIF_F_TSO6 |
+                                  NETIF_F_HW_CSUM);
 
         if (pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 378ce46a7f92..dc3b12e15331 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -209,6 +209,7 @@ enum ixbge_ring_state_t {
 #define clear_ring_rsc_enabled(ring) \
         clear_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)
 struct ixgbe_ring {
+        struct ixgbe_ring *next;        /* pointer to next ring in q_vector */
         void *desc;                     /* descriptor ring memory */
         struct device *dev;             /* device for DMA mapping */
         struct net_device *netdev;      /* netdev ring belongs to */
@@ -277,11 +278,7 @@ struct ixgbe_ring_feature {
 } ____cacheline_internodealigned_in_smp;
 
 struct ixgbe_ring_container {
-#if MAX_RX_QUEUES > MAX_TX_QUEUES
-        DECLARE_BITMAP(idx, MAX_RX_QUEUES);
-#else
-        DECLARE_BITMAP(idx, MAX_TX_QUEUES);
-#endif
+        struct ixgbe_ring *ring;        /* pointer to linked list of rings */
         unsigned int total_bytes;       /* total bytes processed this int */
         unsigned int total_packets;     /* total packets processed this int */
         u16 work_limit;                 /* total work allowed per interrupt */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e8aad76fa530..bb54d3d28419 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -804,13 +804,13 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
         struct ixgbe_tx_buffer *tx_buffer;
         union ixgbe_adv_tx_desc *tx_desc;
         unsigned int total_bytes = 0, total_packets = 0;
+        u16 budget = q_vector->tx.work_limit;
         u16 i = tx_ring->next_to_clean;
-        u16 count;
 
         tx_buffer = &tx_ring->tx_buffer_info[i];
         tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
 
-        for (count = 0; count < q_vector->tx.work_limit; count++) {
+        for (; budget; budget--) {
                 union ixgbe_adv_tx_desc *eop_desc = tx_buffer->next_to_watch;
 
                 /* if next_to_watch is not set then there is no work pending */
@@ -891,11 +891,11 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
                 ixgbe_tx_timeout_reset(adapter);
 
                 /* the adapter is about to reset, no point in enabling stuff */
-                return true;
+                return budget;
         }
 
 #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
-        if (unlikely(count && netif_carrier_ok(tx_ring->netdev) &&
+        if (unlikely(total_packets && netif_carrier_ok(tx_ring->netdev) &&
                      (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {
                 /* Make sure that anybody stopping the queue after this
                  * sees the new next_to_clean.
@@ -908,7 +908,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
                 }
         }
 
-        return count < q_vector->tx.work_limit;
+        return budget;
 }
 
 #ifdef CONFIG_IXGBE_DCA
@@ -974,26 +974,17 @@ static void ixgbe_update_tx_dca(struct ixgbe_adapter *adapter,
 static void ixgbe_update_dca(struct ixgbe_q_vector *q_vector)
 {
         struct ixgbe_adapter *adapter = q_vector->adapter;
+        struct ixgbe_ring *ring;
         int cpu = get_cpu();
-        long r_idx;
-        int i;
 
         if (q_vector->cpu == cpu)
                 goto out_no_update;
 
-        r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-        for (i = 0; i < q_vector->tx.count; i++) {
-                ixgbe_update_tx_dca(adapter, adapter->tx_ring[r_idx], cpu);
-                r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                      r_idx + 1);
-        }
+        for (ring = q_vector->tx.ring; ring != NULL; ring = ring->next)
+                ixgbe_update_tx_dca(adapter, ring, cpu);
 
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        for (i = 0; i < q_vector->rx.count; i++) {
-                ixgbe_update_rx_dca(adapter, adapter->rx_ring[r_idx], cpu);
-                r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                      r_idx + 1);
-        }
+        for (ring = q_vector->rx.ring; ring != NULL; ring = ring->next)
+                ixgbe_update_rx_dca(adapter, ring, cpu);
 
         q_vector->cpu = cpu;
 out_no_update:
@@ -1546,7 +1537,7 @@ static int ixgbe_clean_rxonly(struct napi_struct *, int);
 static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
 {
         struct ixgbe_q_vector *q_vector;
-        int i, q_vectors, v_idx, r_idx;
+        int q_vectors, v_idx;
         u32 mask;
 
         q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
@@ -1556,33 +1547,19 @@ static void ixgbe_configure_msix(struct ixgbe_adapter *adapter)
          * corresponding register.
          */
         for (v_idx = 0; v_idx < q_vectors; v_idx++) {
+                struct ixgbe_ring *ring;
                 q_vector = adapter->q_vector[v_idx];
-                /* XXX for_each_set_bit(...) */
-                r_idx = find_first_bit(q_vector->rx.idx,
-                                       adapter->num_rx_queues);
-
-                for (i = 0; i < q_vector->rx.count; i++) {
-                        u8 reg_idx = adapter->rx_ring[r_idx]->reg_idx;
-                        ixgbe_set_ivar(adapter, 0, reg_idx, v_idx);
-                        r_idx = find_next_bit(q_vector->rx.idx,
-                                              adapter->num_rx_queues,
-                                              r_idx + 1);
-                }
-                r_idx = find_first_bit(q_vector->tx.idx,
-                                       adapter->num_tx_queues);
-
-                for (i = 0; i < q_vector->tx.count; i++) {
-                        u8 reg_idx = adapter->tx_ring[r_idx]->reg_idx;
-                        ixgbe_set_ivar(adapter, 1, reg_idx, v_idx);
-                        r_idx = find_next_bit(q_vector->tx.idx,
-                                              adapter->num_tx_queues,
-                                              r_idx + 1);
-                }
 
-                if (q_vector->tx.count && !q_vector->rx.count)
+                for (ring = q_vector->rx.ring; ring != NULL; ring = ring->next)
+                        ixgbe_set_ivar(adapter, 0, ring->reg_idx, v_idx);
+
+                for (ring = q_vector->tx.ring; ring != NULL; ring = ring->next)
+                        ixgbe_set_ivar(adapter, 1, ring->reg_idx, v_idx);
+
+                if (q_vector->tx.ring && !q_vector->rx.ring)
                         /* tx only */
                         q_vector->eitr = adapter->tx_eitr_param;
-                else if (q_vector->rx.count)
+                else if (q_vector->rx.ring)
                         /* rx or mixed */
                         q_vector->eitr = adapter->rx_eitr_param;
 
@@ -2006,20 +1983,10 @@ static inline void ixgbe_irq_disable_queues(struct ixgbe_adapter *adapter,
 static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
 {
         struct ixgbe_q_vector *q_vector = data;
-        struct ixgbe_adapter  *adapter = q_vector->adapter;
-        struct ixgbe_ring     *tx_ring;
-        int i, r_idx;
 
         if (!q_vector->tx.count)
                 return IRQ_HANDLED;
 
-        r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-        for (i = 0; i < q_vector->tx.count; i++) {
-                tx_ring = adapter->tx_ring[r_idx];
-                r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                      r_idx + 1);
-        }
-
         /* EIAM disabled interrupts (on this vector) for us */
         napi_schedule(&q_vector->napi);
 
@@ -2034,22 +2001,6 @@ static irqreturn_t ixgbe_msix_clean_tx(int irq, void *data)
 static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
 {
         struct ixgbe_q_vector *q_vector = data;
-        struct ixgbe_adapter  *adapter = q_vector->adapter;
-        struct ixgbe_ring  *rx_ring;
-        int r_idx;
-        int i;
-
-#ifdef CONFIG_IXGBE_DCA
-        if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
-                ixgbe_update_dca(q_vector);
-#endif
-
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        for (i = 0; i < q_vector->rx.count; i++) {
-                rx_ring = adapter->rx_ring[r_idx];
-                r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                      r_idx + 1);
-        }
 
         if (!q_vector->rx.count)
                 return IRQ_HANDLED;
@@ -2063,28 +2014,10 @@ static irqreturn_t ixgbe_msix_clean_rx(int irq, void *data)
 static irqreturn_t ixgbe_msix_clean_many(int irq, void *data)
 {
         struct ixgbe_q_vector *q_vector = data;
-        struct ixgbe_adapter  *adapter = q_vector->adapter;
-        struct ixgbe_ring  *ring;
-        int r_idx;
-        int i;
 
         if (!q_vector->tx.count && !q_vector->rx.count)
                 return IRQ_HANDLED;
 
-        r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-        for (i = 0; i < q_vector->tx.count; i++) {
-                ring = adapter->tx_ring[r_idx];
-                r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                      r_idx + 1);
-        }
-
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        for (i = 0; i < q_vector->rx.count; i++) {
-                ring = adapter->rx_ring[r_idx];
-                r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                      r_idx + 1);
-        }
-
         /* EIAM disabled interrupts (on this vector) for us */
         napi_schedule(&q_vector->napi);
 
@@ -2104,19 +2037,14 @@ static int ixgbe_clean_rxonly(struct napi_struct *napi, int budget)
         struct ixgbe_q_vector *q_vector =
                                container_of(napi, struct ixgbe_q_vector, napi);
         struct ixgbe_adapter *adapter = q_vector->adapter;
-        struct ixgbe_ring *rx_ring = NULL;
         int work_done = 0;
-        long r_idx;
 
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                 ixgbe_update_dca(q_vector);
 #endif
 
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        rx_ring = adapter->rx_ring[r_idx];
-
-        ixgbe_clean_rx_irq(q_vector, rx_ring, &work_done, budget);
+        ixgbe_clean_rx_irq(q_vector, q_vector->rx.ring, &work_done, budget);
 
         /* If all Rx work done, exit the polling mode */
         if (work_done < budget) {
@@ -2144,38 +2072,29 @@ static int ixgbe_clean_rxtx_many(struct napi_struct *napi, int budget)
         struct ixgbe_q_vector *q_vector =
                                container_of(napi, struct ixgbe_q_vector, napi);
         struct ixgbe_adapter *adapter = q_vector->adapter;
-        struct ixgbe_ring *ring = NULL;
-        int work_done = 0, i;
-        long r_idx;
-        bool tx_clean_complete = true;
+        struct ixgbe_ring *ring;
+        int work_done = 0;
+        bool clean_complete = true;
 
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                 ixgbe_update_dca(q_vector);
 #endif
 
-        r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-        for (i = 0; i < q_vector->tx.count; i++) {
-                ring = adapter->tx_ring[r_idx];
-                tx_clean_complete &= ixgbe_clean_tx_irq(q_vector, ring);
-                r_idx = find_next_bit(q_vector->tx.idx, adapter->num_tx_queues,
-                                      r_idx + 1);
-        }
+        for (ring = q_vector->tx.ring; ring != NULL; ring = ring->next)
+                clean_complete &= ixgbe_clean_tx_irq(q_vector, ring);
 
         /* attempt to distribute budget to each queue fairly, but don't allow
          * the budget to go below 1 because we'll exit polling */
         budget /= (q_vector->rx.count ?: 1);
         budget = max(budget, 1);
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        for (i = 0; i < q_vector->rx.count; i++) {
-                ring = adapter->rx_ring[r_idx];
+
+        for (ring = q_vector->rx.ring; ring != NULL; ring = ring->next)
                 ixgbe_clean_rx_irq(q_vector, ring, &work_done, budget);
-                r_idx = find_next_bit(q_vector->rx.idx, adapter->num_rx_queues,
-                                      r_idx + 1);
-        }
 
-        r_idx = find_first_bit(q_vector->rx.idx, adapter->num_rx_queues);
-        ring = adapter->rx_ring[r_idx];
+        if (!clean_complete)
+                work_done = budget;
+
         /* If all Rx work done, exit the polling mode */
         if (work_done < budget) {
                 napi_complete(napi);
@@ -2203,32 +2122,23 @@ static int ixgbe_clean_txonly(struct napi_struct *napi, int budget)
         struct ixgbe_q_vector *q_vector =
                                container_of(napi, struct ixgbe_q_vector, napi);
         struct ixgbe_adapter *adapter = q_vector->adapter;
-        struct ixgbe_ring *tx_ring = NULL;
-        int work_done = 0;
-        long r_idx;
 
 #ifdef CONFIG_IXGBE_DCA
         if (adapter->flags & IXGBE_FLAG_DCA_ENABLED)
                 ixgbe_update_dca(q_vector);
 #endif
 
-        r_idx = find_first_bit(q_vector->tx.idx, adapter->num_tx_queues);
-        tx_ring = adapter->tx_ring[r_idx];
-
-        if (!ixgbe_clean_tx_irq(q_vector, tx_ring))
-                work_done = budget;
+        if (!ixgbe_clean_tx_irq(q_vector, q_vector->tx.ring))
+                return budget;
 
         /* If all Tx work done, exit the polling mode */
-        if (work_done < budget) {
-                napi_complete(napi);
-                if (adapter->tx_itr_setting & 1)
-                        ixgbe_set_itr(q_vector);
-                if (!test_bit(__IXGBE_DOWN, &adapter->state))
-                        ixgbe_irq_enable_queues(adapter,
-                                                ((u64)1 << q_vector->v_idx));
-        }
+        napi_complete(napi);
+        if (adapter->tx_itr_setting & 1)
+                ixgbe_set_itr(q_vector);
+        if (!test_bit(__IXGBE_DOWN, &adapter->state))
+                ixgbe_irq_enable_queues(adapter, ((u64)1 << q_vector->v_idx));
 
-        return work_done;
+        return 0;
 }
 
 static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,
@@ -2237,9 +2147,10 @@ static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx,
         struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
         struct ixgbe_ring *rx_ring = a->rx_ring[r_idx];
 
-        set_bit(r_idx, q_vector->rx.idx);
-        q_vector->rx.count++;
         rx_ring->q_vector = q_vector;
+        rx_ring->next = q_vector->rx.ring;
+        q_vector->rx.ring = rx_ring;
+        q_vector->rx.count++;
 }
 
 static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
@@ -2248,9 +2159,10 @@ static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx,
         struct ixgbe_q_vector *q_vector = a->q_vector[v_idx];
         struct ixgbe_ring *tx_ring = a->tx_ring[t_idx];
 
-        set_bit(t_idx, q_vector->tx.idx);
-        q_vector->tx.count++;
         tx_ring->q_vector = q_vector;
+        tx_ring->next = q_vector->tx.ring;
+        q_vector->tx.ring = tx_ring;
+        q_vector->tx.count++;
         q_vector->tx.work_limit = a->tx_work_limit;
 }
 
@@ -2508,14 +2420,26 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
 
 static inline void ixgbe_reset_q_vectors(struct ixgbe_adapter *adapter)
 {
-        int i, q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+        int q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
+        int i;
+
+        /* legacy and MSI only use one vector */
+        if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))
+                q_vectors = 1;
+
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                adapter->rx_ring[i]->q_vector = NULL;
+                adapter->rx_ring[i]->next = NULL;
+        }
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                adapter->tx_ring[i]->q_vector = NULL;
+                adapter->tx_ring[i]->next = NULL;
+        }
 
         for (i = 0; i < q_vectors; i++) {
                 struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
-                bitmap_zero(q_vector->rx.idx, MAX_RX_QUEUES);
-                bitmap_zero(q_vector->tx.idx, MAX_TX_QUEUES);
-                q_vector->rx.count = 0;
-                q_vector->tx.count = 0;
+                memset(&q_vector->rx, 0, sizeof(struct ixgbe_ring_container));
+                memset(&q_vector->tx, 0, sizeof(struct ixgbe_ring_container));
         }
 }
 
@@ -5923,7 +5847,7 @@ static void ixgbe_check_hang_subtask(struct ixgbe_adapter *adapter)
                 /* get one bit for every active tx/rx interrupt vector */
                 for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) {
                         struct ixgbe_q_vector *qv = adapter->q_vector[i];
-                        if (qv->rx.count || qv->tx.count)
+                        if (qv->rx.ring || qv->tx.ring)
                                 eics |= ((u64)1 << i);
                 }
         }
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index deee3754b1f7..e1d9e3b63448 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -117,44 +117,6 @@ static int ixgbevf_get_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 ixgbevf_get_rx_csum(struct net_device *netdev)
-{
-        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-        return adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED;
-}
-
-static int ixgbevf_set_rx_csum(struct net_device *netdev, u32 data)
-{
-        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
-        if (data)
-                adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
-        else
-                adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
-
-        if (netif_running(netdev)) {
-                if (!adapter->dev_closed)
-                        ixgbevf_reinit_locked(adapter);
-        } else {
-                ixgbevf_reset(adapter);
-        }
-
-        return 0;
-}
-
-static int ixgbevf_set_tso(struct net_device *netdev, u32 data)
-{
-        if (data) {
-                netdev->features |= NETIF_F_TSO;
-                netdev->features |= NETIF_F_TSO6;
-        } else {
-                netif_tx_stop_all_queues(netdev);
-                netdev->features &= ~NETIF_F_TSO;
-                netdev->features &= ~NETIF_F_TSO6;
-                netif_tx_start_all_queues(netdev);
-        }
-        return 0;
-}
-
 static u32 ixgbevf_get_msglevel(struct net_device *netdev)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
@@ -720,16 +682,8 @@ static struct ethtool_ops ixgbevf_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
         .get_ringparam          = ixgbevf_get_ringparam,
         .set_ringparam          = ixgbevf_set_ringparam,
-        .get_rx_csum            = ixgbevf_get_rx_csum,
-        .set_rx_csum            = ixgbevf_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .set_tx_csum            = ethtool_op_set_tx_ipv6_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
         .get_msglevel           = ixgbevf_get_msglevel,
         .set_msglevel           = ixgbevf_set_msglevel,
-        .get_tso                = ethtool_op_get_tso,
-        .set_tso                = ixgbevf_set_tso,
         .self_test              = ixgbevf_diag_test,
         .get_sset_count         = ixgbevf_get_sset_count,
         .get_strings            = ixgbevf_get_strings,
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 8857df4dd3b9..e6c9d1a927a9 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -34,6 +34,7 @@
 #include <linux/io.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
+#include <linux/u64_stats_sync.h>
 
 #include "vf.h"
 
@@ -71,12 +72,13 @@ struct ixgbevf_ring {
                 struct ixgbevf_rx_buffer *rx_buffer_info;
         };
 
+        u64                     total_bytes;
+        u64                     total_packets;
+        struct u64_stats_sync   syncp;
+
         u16 head;
         u16 tail;
 
-        unsigned int total_bytes;
-        unsigned int total_packets;
-
         u16 reg_idx; /* holds the special value that gets the hardware register
                       * offset associated with this ring, which is different
                       * for DCB and RSS modes */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index b1e1c2daf5f9..98963970206e 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -203,6 +203,9 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
                (count < tx_ring->work_limit)) {
                 bool cleaned = false;
                 rmb(); /* read buffer_info after eop_desc */
+                /* eop could change between read and DD-check */
+                if (unlikely(eop != tx_ring->tx_buffer_info[i].next_to_watch))
+                        goto cont_loop;
                 for ( ; !cleaned; count++) {
                         struct sk_buff *skb;
                         tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, i);
@@ -232,6 +235,7 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
                                 i = 0;
                 }
 
+cont_loop:
                 eop = tx_ring->tx_buffer_info[i].next_to_watch;
                 eop_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
         }
@@ -266,11 +270,10 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
                 IXGBE_WRITE_REG(hw, IXGBE_VTEICS, tx_ring->v_idx);
         }
 
+        u64_stats_update_begin(&tx_ring->syncp);
         tx_ring->total_bytes += total_bytes;
         tx_ring->total_packets += total_packets;
-
-        netdev->stats.tx_bytes += total_bytes;
-        netdev->stats.tx_packets += total_packets;
+        u64_stats_update_end(&tx_ring->syncp);
 
         return count < tx_ring->work_limit;
 }
@@ -593,10 +596,10 @@ next_desc:
         if (cleaned_count)
                 ixgbevf_alloc_rx_buffers(adapter, rx_ring, cleaned_count);
 
+        u64_stats_update_begin(&rx_ring->syncp);
         rx_ring->total_packets += total_rx_packets;
         rx_ring->total_bytes += total_rx_bytes;
-        adapter->netdev->stats.rx_bytes += total_rx_bytes;
-        adapter->netdev->stats.rx_packets += total_rx_packets;
+        u64_stats_update_end(&rx_ring->syncp);
 
         return cleaned;
 }
@@ -2256,10 +2259,6 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
                                 adapter->stats.vfgotc);
         UPDATE_VF_COUNTER_32bit(IXGBE_VFMPRC, adapter->stats.last_vfmprc,
                                 adapter->stats.vfmprc);
-
-        /* Fill out the OS statistics structure */
-        adapter->netdev->stats.multicast = adapter->stats.vfmprc -
-                adapter->stats.base_vfmprc;
 }
 
 /**
@@ -3216,17 +3215,69 @@ static void ixgbevf_shutdown(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
+static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
+                                                struct rtnl_link_stats64 *stats)
+{
+        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+        unsigned int start;
+        u64 bytes, packets;
+        const struct ixgbevf_ring *ring;
+        int i;
+
+        ixgbevf_update_stats(adapter);
+
+        stats->multicast = adapter->stats.vfmprc - adapter->stats.base_vfmprc;
+
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                ring = &adapter->rx_ring[i];
+                do {
+                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        bytes = ring->total_bytes;
+                        packets = ring->total_packets;
+                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                stats->rx_bytes += bytes;
+                stats->rx_packets += packets;
+        }
+
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                ring = &adapter->tx_ring[i];
+                do {
+                        start = u64_stats_fetch_begin_bh(&ring->syncp);
+                        bytes = ring->total_bytes;
+                        packets = ring->total_packets;
+                } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
+                stats->tx_bytes += bytes;
+                stats->tx_packets += packets;
+        }
+
+        return stats;
+}
+
+static int ixgbevf_set_features(struct net_device *netdev, u32 features)
+{
+        struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+        if (features & NETIF_F_RXCSUM)
+                adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
+        else
+                adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;
+
+        return 0;
+}
+
 static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_open               = ixgbevf_open,
         .ndo_stop               = ixgbevf_close,
         .ndo_start_xmit         = ixgbevf_xmit_frame,
         .ndo_set_rx_mode        = ixgbevf_set_rx_mode,
+        .ndo_get_stats64        = ixgbevf_get_stats,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = ixgbevf_set_mac,
         .ndo_change_mtu         = ixgbevf_change_mtu,
         .ndo_tx_timeout         = ixgbevf_tx_timeout,
         .ndo_vlan_rx_add_vid    = ixgbevf_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = ixgbevf_vlan_rx_kill_vid,
+        .ndo_set_features       = ixgbevf_set_features,
 };
 
 static void ixgbevf_assign_netdev_ops(struct net_device *dev)
@@ -3339,16 +3390,18 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
         /* setup the private structure */
         err = ixgbevf_sw_init(adapter);
 
-        netdev->features = NETIF_F_SG |
+        netdev->hw_features = NETIF_F_SG |
                            NETIF_F_IP_CSUM |
+                           NETIF_F_IPV6_CSUM |
+                           NETIF_F_TSO |
+                           NETIF_F_TSO6 |
+                           NETIF_F_RXCSUM;
+
+        netdev->features = netdev->hw_features |
                            NETIF_F_HW_VLAN_TX |
                            NETIF_F_HW_VLAN_RX |
                            NETIF_F_HW_VLAN_FILTER;
 
-        netdev->features |= NETIF_F_IPV6_CSUM;
-        netdev->features |= NETIF_F_TSO;
-        netdev->features |= NETIF_F_TSO6;
-        netdev->features |= NETIF_F_GRO;
         netdev->vlan_features |= NETIF_F_TSO;
         netdev->vlan_features |= NETIF_F_TSO6;
         netdev->vlan_features |= NETIF_F_IP_CSUM;