Commit 3f76bdb4 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher

i40e: use the more traditional 'i' loop variable

Since we no longer use i as an array index for the data variable,
replace the use of 'j' with 'i' so that we match the general loop
variable name.
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ec29bbf8
...@@ -1726,26 +1726,26 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, ...@@ -1726,26 +1726,26 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
struct i40e_ring *tx_ring, *rx_ring; struct i40e_ring *tx_ring, *rx_ring;
struct i40e_vsi *vsi = np->vsi; struct i40e_vsi *vsi = np->vsi;
struct i40e_pf *pf = vsi->back; struct i40e_pf *pf = vsi->back;
unsigned int j; unsigned int i;
char *p; char *p;
struct rtnl_link_stats64 *net_stats = i40e_get_vsi_stats_struct(vsi); struct rtnl_link_stats64 *net_stats = i40e_get_vsi_stats_struct(vsi);
unsigned int start; unsigned int start;
i40e_update_stats(vsi); i40e_update_stats(vsi);
for (j = 0; j < I40E_NETDEV_STATS_LEN; j++) { for (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {
p = (char *)net_stats + i40e_gstrings_net_stats[j].stat_offset; p = (char *)net_stats + i40e_gstrings_net_stats[i].stat_offset;
*(data++) = (i40e_gstrings_net_stats[j].sizeof_stat == *(data++) = (i40e_gstrings_net_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
for (j = 0; j < I40E_MISC_STATS_LEN; j++) { for (i = 0; i < I40E_MISC_STATS_LEN; i++) {
p = (char *)vsi + i40e_gstrings_misc_stats[j].stat_offset; p = (char *)vsi + i40e_gstrings_misc_stats[i].stat_offset;
*(data++) = (i40e_gstrings_misc_stats[j].sizeof_stat == *(data++) = (i40e_gstrings_misc_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
rcu_read_lock(); rcu_read_lock();
for (j = 0; j < I40E_MAX_NUM_QUEUES(netdev) ; j++) { for (i = 0; i < I40E_MAX_NUM_QUEUES(netdev) ; i++) {
tx_ring = READ_ONCE(vsi->tx_rings[j]); tx_ring = READ_ONCE(vsi->tx_rings[i]);
if (!tx_ring) { if (!tx_ring) {
/* Bump the stat counter to skip these stats, and make /* Bump the stat counter to skip these stats, and make
...@@ -1783,36 +1783,36 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, ...@@ -1783,36 +1783,36 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
(pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) { (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {
struct i40e_veb *veb = pf->veb[pf->lan_veb]; struct i40e_veb *veb = pf->veb[pf->lan_veb];
for (j = 0; j < I40E_VEB_STATS_LEN; j++) { for (i = 0; i < I40E_VEB_STATS_LEN; i++) {
p = (char *)veb; p = (char *)veb;
p += i40e_gstrings_veb_stats[j].stat_offset; p += i40e_gstrings_veb_stats[i].stat_offset;
*(data++) = (i40e_gstrings_veb_stats[j].sizeof_stat == *(data++) = (i40e_gstrings_veb_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
for (j = 0; j < I40E_MAX_TRAFFIC_CLASS; j++) { for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
*(data++) = veb->tc_stats.tc_tx_packets[j]; *(data++) = veb->tc_stats.tc_tx_packets[i];
*(data++) = veb->tc_stats.tc_tx_bytes[j]; *(data++) = veb->tc_stats.tc_tx_bytes[i];
*(data++) = veb->tc_stats.tc_rx_packets[j]; *(data++) = veb->tc_stats.tc_rx_packets[i];
*(data++) = veb->tc_stats.tc_rx_bytes[j]; *(data++) = veb->tc_stats.tc_rx_bytes[i];
} }
} else { } else {
data += I40E_VEB_STATS_TOTAL; data += I40E_VEB_STATS_TOTAL;
} }
for (j = 0; j < I40E_GLOBAL_STATS_LEN; j++) { for (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {
p = (char *)pf + i40e_gstrings_stats[j].stat_offset; p = (char *)pf + i40e_gstrings_stats[i].stat_offset;
*(data++) = (i40e_gstrings_stats[j].sizeof_stat == *(data++) = (i40e_gstrings_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
for (j = 0; j < I40E_MAX_USER_PRIORITY; j++) { for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
*(data++) = pf->stats.priority_xon_tx[j]; *(data++) = pf->stats.priority_xon_tx[i];
*(data++) = pf->stats.priority_xoff_tx[j]; *(data++) = pf->stats.priority_xoff_tx[i];
} }
for (j = 0; j < I40E_MAX_USER_PRIORITY; j++) { for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
*(data++) = pf->stats.priority_xon_rx[j]; *(data++) = pf->stats.priority_xon_rx[i];
*(data++) = pf->stats.priority_xoff_rx[j]; *(data++) = pf->stats.priority_xoff_rx[i];
} }
for (j = 0; j < I40E_MAX_USER_PRIORITY; j++) for (i = 0; i < I40E_MAX_USER_PRIORITY; i++)
*(data++) = pf->stats.priority_xon_2_xoff[j]; *(data++) = pf->stats.priority_xon_2_xoff[i];
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment