]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: use matching format identifiers
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 10 Aug 2016 23:07:22 +0000 (01:07 +0200)
committerDhaval Giani <dhaval.giani@oracle.com>
Wed, 8 Mar 2017 00:31:46 +0000 (19:31 -0500)
Orabug: 24568124

i is defined as int but output as %u several times.
Adjust the format identifiers.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit fbcfac34167328f9a063e6abd03298afabfe228b)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

index 11677f90805b2dfc3a3daa792091561c68d6b42c..b161b24354b7d4624314d65336c67eea0b52c476 100644 (file)
@@ -1555,13 +1555,13 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
                }
 #endif
                for (i = 0; i < vsi->num_queue_pairs; i++) {
-                       snprintf(p, ETH_GSTRING_LEN, "tx-%u.tx_packets", i);
+                       snprintf(p, ETH_GSTRING_LEN, "tx-%d.tx_packets", i);
                        p += ETH_GSTRING_LEN;
-                       snprintf(p, ETH_GSTRING_LEN, "tx-%u.tx_bytes", i);
+                       snprintf(p, ETH_GSTRING_LEN, "tx-%d.tx_bytes", i);
                        p += ETH_GSTRING_LEN;
-                       snprintf(p, ETH_GSTRING_LEN, "rx-%u.rx_packets", i);
+                       snprintf(p, ETH_GSTRING_LEN, "rx-%d.rx_packets", i);
                        p += ETH_GSTRING_LEN;
-                       snprintf(p, ETH_GSTRING_LEN, "rx-%u.rx_bytes", i);
+                       snprintf(p, ETH_GSTRING_LEN, "rx-%d.rx_bytes", i);
                        p += ETH_GSTRING_LEN;
                }
                if (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id != 1)
@@ -1576,16 +1576,16 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
                        }
                        for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
                                snprintf(p, ETH_GSTRING_LEN,
-                                        "veb.tc_%u_tx_packets", i);
+                                        "veb.tc_%d_tx_packets", i);
                                p += ETH_GSTRING_LEN;
                                snprintf(p, ETH_GSTRING_LEN,
-                                        "veb.tc_%u_tx_bytes", i);
+                                        "veb.tc_%d_tx_bytes", i);
                                p += ETH_GSTRING_LEN;
                                snprintf(p, ETH_GSTRING_LEN,
-                                        "veb.tc_%u_rx_packets", i);
+                                        "veb.tc_%d_rx_packets", i);
                                p += ETH_GSTRING_LEN;
                                snprintf(p, ETH_GSTRING_LEN,
-                                        "veb.tc_%u_rx_bytes", i);
+                                        "veb.tc_%d_rx_bytes", i);
                                p += ETH_GSTRING_LEN;
                        }
                }
@@ -1596,23 +1596,23 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
                }
                for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
                        snprintf(p, ETH_GSTRING_LEN,
-                                "port.tx_priority_%u_xon", i);
+                                "port.tx_priority_%d_xon", i);
                        p += ETH_GSTRING_LEN;
                        snprintf(p, ETH_GSTRING_LEN,
-                                "port.tx_priority_%u_xoff", i);
+                                "port.tx_priority_%d_xoff", i);
                        p += ETH_GSTRING_LEN;
                }
                for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
                        snprintf(p, ETH_GSTRING_LEN,
-                                "port.rx_priority_%u_xon", i);
+                                "port.rx_priority_%d_xon", i);
                        p += ETH_GSTRING_LEN;
                        snprintf(p, ETH_GSTRING_LEN,
-                                "port.rx_priority_%u_xoff", i);
+                                "port.rx_priority_%d_xoff", i);
                        p += ETH_GSTRING_LEN;
                }
                for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) {
                        snprintf(p, ETH_GSTRING_LEN,
-                                "port.rx_priority_%u_xon_2_xoff", i);
+                                "port.rx_priority_%d_xon_2_xoff", i);
                        p += ETH_GSTRING_LEN;
                }
                /* BUG_ON(p - data != I40E_STATS_LEN * ETH_GSTRING_LEN); */