diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-04 10:55:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-04 10:55:50 -0400 |
commit | 8af3994e23b02ef18bde7e5174ef6d902b402677 (patch) | |
tree | 760e77462115fe9bf3e14117cb34c30cb9077050 /drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |
parent | 0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311 (diff) | |
parent | dd7f5c9e5cb24f72140206d3e5961b4cc5a84034 (diff) | |
download | kernel_replicant_linux-8af3994e23b02ef18bde7e5174ef6d902b402677.tar.gz kernel_replicant_linux-8af3994e23b02ef18bde7e5174ef6d902b402677.tar.bz2 kernel_replicant_linux-8af3994e23b02ef18bde7e5174ef6d902b402677.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index 31a2bf76a346..cfe7d269590c 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, rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc); } + netdev_tx_reset_queue(txring_txq(tx_ring)); + /* re-map buffers to ring, store next to clean values */ ixgbe_alloc_rx_buffers(rx_ring, count); rx_ring->next_to_clean = rx_ntc; |