Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / igb / igb_ethtool.c

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 174540f262d7e2731fbfc8f3389a77cb109cc7b0..43873eba2f63eaa157980b078e14c6d56f6d2885 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1577,16 +1577,14 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
        union e1000_adv_rx_desc *rx_desc;
        struct igb_rx_buffer *rx_buffer_info;
        struct igb_tx_buffer *tx_buffer_info;
-       int rx_ntc, tx_ntc, count = 0;
-       u32 staterr;
+       u16 rx_ntc, tx_ntc, count = 0;
 
        /* initialize next to clean and descriptor values */
        rx_ntc = rx_ring->next_to_clean;
        tx_ntc = tx_ring->next_to_clean;
        rx_desc = IGB_RX_DESC(rx_ring, rx_ntc);
-       staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
 
-       while (staterr & E1000_RXD_STAT_DD) {
+       while (igb_test_staterr(rx_desc, E1000_RXD_STAT_DD)) {
                /* check rx buffer */
                rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];
 
@@ -1615,7 +1613,6 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring,
 
                /* fetch next descriptor */
                rx_desc = IGB_RX_DESC(rx_ring, rx_ntc);
-               staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
        }
 
        /* re-map buffers to ring, store next to clean values */
@@ -1630,7 +1627,8 @@ static int igb_run_loopback_test(struct igb_adapter *adapter)
 {
        struct igb_ring *tx_ring = &adapter->test_tx_ring;
        struct igb_ring *rx_ring = &adapter->test_rx_ring;
-       int i, j, lc, good_cnt, ret_val = 0;
+       u16 i, j, lc, good_cnt;
+       int ret_val = 0;
        unsigned int size = IGB_RX_HDR_LEN;
        netdev_tx_t tx_ret_val;
        struct sk_buff *skb;
@@ -2008,8 +2006,8 @@ static int igb_set_coalesce(struct net_device *netdev,
 
        for (i = 0; i < adapter->num_q_vectors; i++) {
                struct igb_q_vector *q_vector = adapter->q_vector[i];
-               q_vector->tx_work_limit = adapter->tx_work_limit;
-               if (q_vector->rx_ring)
+               q_vector->tx.work_limit = adapter->tx_work_limit;
+               if (q_vector->rx.ring)
                        q_vector->itr_val = adapter->rx_itr_setting;
                else
                        q_vector->itr_val = adapter->tx_itr_setting;