diff options
author | David S. Miller <davem@davemloft.net> | 2012-02-13 02:05:16 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-13 02:05:16 +0400 |
commit | 3cc26e36a0862f8d6906bd2ad6d371f2933bc355 (patch) | |
tree | 12c4d9d282802bd7252d7ef88a72ec3d5799dc5d /drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | |
parent | d5ef8a4d87ab21d575ac86366599c9152a28028d (diff) | |
parent | 4031ae6edb92f7e0aade76357813211ae0520a5c (diff) | |
download | linux-3cc26e36a0862f8d6906bd2ad6d371f2933bc355.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index a62975480e37..8e2e4732b1a7 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -1739,7 +1739,7 @@ static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring, /* initialize next to clean and descriptor values */ rx_ntc = rx_ring->next_to_clean; tx_ntc = tx_ring->next_to_clean; - rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc); + rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc); staterr = le32_to_cpu(rx_desc->wb.upper.status_error); while (staterr & IXGBE_RXD_STAT_DD) { @@ -1770,7 +1770,7 @@ static u16 ixgbe_clean_test_rings(struct ixgbe_ring *rx_ring, tx_ntc = 0; /* fetch next descriptor */ - rx_desc = IXGBE_RX_DESC_ADV(rx_ring, rx_ntc); + rx_desc = IXGBE_RX_DESC(rx_ring, rx_ntc); staterr = le32_to_cpu(rx_desc->wb.upper.status_error); } |