i40e/i40evf: replace for memcpy with single memcpy call in ethtool

Orabug: 24568124

memcpy replaced with single memcpy call in ethtool.

Change-ID: I3f5bef6bcc593412c56592c6459784db41575a0a
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>
(cherry picked from commit e5d32205555da77ec8d0d129ffa27c20f3d60230)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index a29e52245c8bede6435169946462c4ca33a575f0..e3d8021fe60fcc707deaf1df981c816f3c209c84 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1530,10 +1530,8 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
 
        switch (stringset) {
        case ETH_SS_TEST:
-               for (i = 0; i < I40E_TEST_LEN; i++) {
-                       memcpy(data, i40e_gstrings_test[i], ETH_GSTRING_LEN);
-                       data += ETH_GSTRING_LEN;
-               }
+               memcpy(data, i40e_gstrings_test,
+                      I40E_TEST_LEN * ETH_GSTRING_LEN);
                break;
        case ETH_SS_STATS:
                for (i = 0; i < I40E_NETDEV_STATS_LEN; i++) {
@@ -1617,18 +1615,12 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset,
                /* BUG_ON(p - data != I40E_STATS_LEN * ETH_GSTRING_LEN); */
                break;
        case ETH_SS_PRIV_FLAGS:
-               for (i = 0; i < I40E_PRIV_FLAGS_STR_LEN; i++) {
-                       memcpy(data, i40e_priv_flags_strings[i],
-                              ETH_GSTRING_LEN);
-                       data += ETH_GSTRING_LEN;
-               }
-               if (pf->hw.pf_id == 0) {
-                       for (i = 0; i < I40E_GL_PRIV_FLAGS_STR_LEN; i++) {
-                               memcpy(data, i40e_gl_priv_flags_strings[i],
-                                      ETH_GSTRING_LEN);
-                               data += ETH_GSTRING_LEN;
-                       }
-               }
+               memcpy(data, i40e_priv_flags_strings,
+                      I40E_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN);
+               data += I40E_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN;
+               if (pf->hw.pf_id == 0)
+                       memcpy(data, i40e_gl_priv_flags_strings,
+                              I40E_GL_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN);
                break;
        default:
                break;