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: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 4b5ecba0148c8fea75ac253cd0a40710a1fe4f11..6947a2a571cb2df2aae4e820344ee16dd3487c27 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1726,26 +1726,26 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
        struct i40e_ring *tx_ring, *rx_ring;
        struct i40e_vsi *vsi = np->vsi;
        struct i40e_pf *pf = vsi->back;
-       unsigned int j;
+       unsigned int i;
        char *p;
        struct rtnl_link_stats64 *net_stats = i40e_get_vsi_stats_struct(vsi);
        unsigned int start;
 
        i40e_update_stats(vsi);
 
-       for (j = 0; j < I40E_NETDEV_STATS_LEN; j++) {
-               p = (char *)net_stats + i40e_gstrings_net_stats[j].stat_offset;
-               *(data++) = (i40e_gstrings_net_stats[j].sizeof_stat ==
+       for (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {
+               p = (char *)net_stats + i40e_gstrings_net_stats[i].stat_offset;
+               *(data++) = (i40e_gstrings_net_stats[i].sizeof_stat ==
                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
-       for (j = 0; j < I40E_MISC_STATS_LEN; j++) {
-               p = (char *)vsi + i40e_gstrings_misc_stats[j].stat_offset;
-               *(data++) = (i40e_gstrings_misc_stats[j].sizeof_stat ==
+       for (i = 0; i < I40E_MISC_STATS_LEN; i++) {
+               p = (char *)vsi + i40e_gstrings_misc_stats[i].stat_offset;
+               *(data++) = (i40e_gstrings_misc_stats[i].sizeof_stat ==
                            sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
        rcu_read_lock();
-       for (j = 0; j < I40E_MAX_NUM_QUEUES(netdev) ; j++) {
-               tx_ring = READ_ONCE(vsi->tx_rings[j]);
+       for (i = 0; i < I40E_MAX_NUM_QUEUES(netdev) ; i++) {
+               tx_ring = READ_ONCE(vsi->tx_rings[i]);
 
                if (!tx_ring) {
                        /* Bump the stat counter to skip these stats, and make
@@ -1783,36 +1783,36 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
            (pf->flags & I40E_FLAG_VEB_STATS_ENABLED)) {
                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 += i40e_gstrings_veb_stats[j].stat_offset;
-                       *(data++) = (i40e_gstrings_veb_stats[j].sizeof_stat ==
+                       p += i40e_gstrings_veb_stats[i].stat_offset;
+                       *(data++) = (i40e_gstrings_veb_stats[i].sizeof_stat ==
                                     sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
                }
-               for (j = 0; j < I40E_MAX_TRAFFIC_CLASS; j++) {
-                       *(data++) = veb->tc_stats.tc_tx_packets[j];
-                       *(data++) = veb->tc_stats.tc_tx_bytes[j];
-                       *(data++) = veb->tc_stats.tc_rx_packets[j];
-                       *(data++) = veb->tc_stats.tc_rx_bytes[j];
+               for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+                       *(data++) = veb->tc_stats.tc_tx_packets[i];
+                       *(data++) = veb->tc_stats.tc_tx_bytes[i];
+                       *(data++) = veb->tc_stats.tc_rx_packets[i];
+                       *(data++) = veb->tc_stats.tc_rx_bytes[i];
                }
        } else {
                data += I40E_VEB_STATS_TOTAL;
        }
-       for (j = 0; j < I40E_GLOBAL_STATS_LEN; j++) {
-               p = (char *)pf + i40e_gstrings_stats[j].stat_offset;
-               *(data++) = (i40e_gstrings_stats[j].sizeof_stat ==
+       for (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {
+               p = (char *)pf + i40e_gstrings_stats[i].stat_offset;
+               *(data++) = (i40e_gstrings_stats[i].sizeof_stat ==
                             sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
-       for (j = 0; j < I40E_MAX_USER_PRIORITY; j++) {
-               *(data++) = pf->stats.priority_xon_tx[j];
-               *(data++) = pf->stats.priority_xoff_tx[j];
+       for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
+               *(data++) = pf->stats.priority_xon_tx[i];
+               *(data++) = pf->stats.priority_xoff_tx[i];
        }
-       for (j = 0; j < I40E_MAX_USER_PRIORITY; j++) {
-               *(data++) = pf->stats.priority_xon_rx[j];
-               *(data++) = pf->stats.priority_xoff_rx[j];
+       for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
+               *(data++) = pf->stats.priority_xon_rx[i];
+               *(data++) = pf->stats.priority_xoff_rx[i];
        }
-       for (j = 0; j < I40E_MAX_USER_PRIORITY; j++)
-               *(data++) = pf->stats.priority_xon_2_xoff[j];
+       for (i = 0; i < I40E_MAX_USER_PRIORITY; i++)
+               *(data++) = pf->stats.priority_xon_2_xoff[i];
 }
 
 /**