diff options
author | Catherine Sullivan <catherine.sullivan@intel.com> | 2014-03-14 03:32:30 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-22 07:13:09 -0400 |
commit | 99c472a3989f080603a0ab9e665c44f37b02b7ed (patch) | |
tree | f8252d7e841c8f613e785e8df0847d46439b30e5 | |
parent | 7c12200797ebc5d0eea65aa653cd14e9b9dd45d8 (diff) |
i40e: Tweak for-loop in i40e_ethtool.c
Tweak a for-loop to make it easier to add conditional stats in the future.
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index d9a41d335c24..0cf47c958081 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c | |||
@@ -649,7 +649,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, | |||
649 | sizeof(u64)) ? *(u64 *)p : *(u32 *)p; | 649 | sizeof(u64)) ? *(u64 *)p : *(u32 *)p; |
650 | } | 650 | } |
651 | rcu_read_lock(); | 651 | rcu_read_lock(); |
652 | for (j = 0; j < vsi->num_queue_pairs; j++, i += 4) { | 652 | for (j = 0; j < vsi->num_queue_pairs; j++) { |
653 | struct i40e_ring *tx_ring = ACCESS_ONCE(vsi->tx_rings[j]); | 653 | struct i40e_ring *tx_ring = ACCESS_ONCE(vsi->tx_rings[j]); |
654 | struct i40e_ring *rx_ring; | 654 | struct i40e_ring *rx_ring; |
655 | 655 | ||
@@ -662,14 +662,16 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, | |||
662 | data[i] = tx_ring->stats.packets; | 662 | data[i] = tx_ring->stats.packets; |
663 | data[i + 1] = tx_ring->stats.bytes; | 663 | data[i + 1] = tx_ring->stats.bytes; |
664 | } while (u64_stats_fetch_retry_irq(&tx_ring->syncp, start)); | 664 | } while (u64_stats_fetch_retry_irq(&tx_ring->syncp, start)); |
665 | i += 2; | ||
665 | 666 | ||
666 | /* Rx ring is the 2nd half of the queue pair */ | 667 | /* Rx ring is the 2nd half of the queue pair */ |
667 | rx_ring = &tx_ring[1]; | 668 | rx_ring = &tx_ring[1]; |
668 | do { | 669 | do { |
669 | start = u64_stats_fetch_begin_irq(&rx_ring->syncp); | 670 | start = u64_stats_fetch_begin_irq(&rx_ring->syncp); |
670 | data[i + 2] = rx_ring->stats.packets; | 671 | data[i] = rx_ring->stats.packets; |
671 | data[i + 3] = rx_ring->stats.bytes; | 672 | data[i + 1] = rx_ring->stats.bytes; |
672 | } while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start)); | 673 | } while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start)); |
674 | i += 2; | ||
673 | } | 675 | } |
674 | rcu_read_unlock(); | 676 | rcu_read_unlock(); |
675 | if (vsi == pf->vsi[pf->lan_vsi]) { | 677 | if (vsi == pf->vsi[pf->lan_vsi]) { |