diff options
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 5ec31598ee4..d2235005528 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -2771,8 +2771,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter, | |||
2771 | 2771 | ||
2772 | txdctl |= E1000_TXDCTL_QUEUE_ENABLE; | 2772 | txdctl |= E1000_TXDCTL_QUEUE_ENABLE; |
2773 | wr32(E1000_TXDCTL(reg_idx), txdctl); | 2773 | wr32(E1000_TXDCTL(reg_idx), txdctl); |
2774 | |||
2775 | netdev_tx_reset_queue(txring_txq(ring)); | ||
2776 | } | 2774 | } |
2777 | 2775 | ||
2778 | /** | 2776 | /** |
@@ -3282,6 +3280,8 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring) | |||
3282 | igb_unmap_and_free_tx_resource(tx_ring, buffer_info); | 3280 | igb_unmap_and_free_tx_resource(tx_ring, buffer_info); |
3283 | } | 3281 | } |
3284 | 3282 | ||
3283 | netdev_tx_reset_queue(txring_txq(tx_ring)); | ||
3284 | |||
3285 | size = sizeof(struct igb_tx_buffer) * tx_ring->count; | 3285 | size = sizeof(struct igb_tx_buffer) * tx_ring->count; |
3286 | memset(tx_ring->tx_buffer_info, 0, size); | 3286 | memset(tx_ring->tx_buffer_info, 0, size); |
3287 | 3287 | ||
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 31a2bf76a34..cfe7d269590 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |||
@@ -1780,6 +1780,8 @@ static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring, | |||
1780 | rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc); | 1780 | rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc); |
1781 | } | 1781 | } |
1782 | 1782 | ||
1783 | netdev_tx_reset_queue(txring_txq(tx_ring)); | ||
1784 | |||
1783 | /* re-map buffers to ring, store next to clean values */ | 1785 | /* re-map buffers to ring, store next to clean values */ |
1784 | ixgbe_alloc_rx_buffers(rx_ring, count); | 1786 | ixgbe_alloc_rx_buffers(rx_ring, count); |
1785 | rx_ring->next_to_clean = rx_ntc; | 1787 | rx_ring->next_to_clean = rx_ntc; |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 50f0700d250..467948e9ecd 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -2671,8 +2671,6 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter, | |||
2671 | /* enable queue */ | 2671 | /* enable queue */ |
2672 | IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl); | 2672 | IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), txdctl); |
2673 | 2673 | ||
2674 | netdev_tx_reset_queue(txring_txq(ring)); | ||
2675 | |||
2676 | /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */ | 2674 | /* TXDCTL.EN will return 0 on 82598 if link is down, so skip it */ |
2677 | if (hw->mac.type == ixgbe_mac_82598EB && | 2675 | if (hw->mac.type == ixgbe_mac_82598EB && |
2678 | !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP)) | 2676 | !(IXGBE_READ_REG(hw, IXGBE_LINKS) & IXGBE_LINKS_UP)) |
@@ -4167,6 +4165,8 @@ static void ixgbe_clean_tx_ring(struct ixgbe_ring *tx_ring) | |||
4167 | ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info); | 4165 | ixgbe_unmap_and_free_tx_resource(tx_ring, tx_buffer_info); |
4168 | } | 4166 | } |
4169 | 4167 | ||
4168 | netdev_tx_reset_queue(txring_txq(tx_ring)); | ||
4169 | |||
4170 | size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count; | 4170 | size = sizeof(struct ixgbe_tx_buffer) * tx_ring->count; |
4171 | memset(tx_ring->tx_buffer_info, 0, size); | 4171 | memset(tx_ring->tx_buffer_info, 0, size); |
4172 | 4172 | ||