i40e: avoid duplicate private flags definitions

Orabug: 24568124

Separate the global private flags and the regular private flags per
interface into two arrays. Future additions of private flags will not
need to be duplicated which may lead to buggy code. Also rename
"i40e_priv_flags_strings_gl" to "i40e_gl_priv_flags_strings" for
clarity, as it reads more naturally.

Change-ID: I68caef3c9954eb7da342d7f9d20f2873186f2758
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 d182a5ca1f72ab4ef5ad118c64fb80aac659b122)
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 5fcb1c5b5c89941c18200a8861675d398d1058a2..5207480abc9660f06428100287ac038b3b22db33 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -228,26 +228,22 @@ static const char i40e_gstrings_test[][ETH_GSTRING_LEN] = {
 
 #define I40E_TEST_LEN (sizeof(i40e_gstrings_test) / ETH_GSTRING_LEN)
 
-static const char i40e_priv_flags_strings_gl[][ETH_GSTRING_LEN] = {
+static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN] = {
        "MFP",
        "LinkPolling",
        "flow-director-atr",
        "veb-stats",
        "hw-atr-eviction",
-       "vf-true-promisc-support",
 };
 
-#define I40E_PRIV_FLAGS_GL_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings_gl)
+#define I40E_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings)
 
-static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN] = {
-       "NPAR",
-       "LinkPolling",
-       "flow-director-atr",
-       "veb-stats",
-       "hw-atr-eviction",
+/* Private flags with a global effect, restricted to PF 0 */
+static const char i40e_gl_priv_flags_strings[][ETH_GSTRING_LEN] = {
+       "vf-true-promisc-support",
 };
 
-#define I40E_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings)
+#define I40E_GL_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_gl_priv_flags_strings)
 
 /**
  * i40e_partition_setting_complaint - generic complaint for MFP restriction
@@ -1196,9 +1192,7 @@ static void i40e_get_drvinfo(struct net_device *netdev,
                sizeof(drvinfo->bus_info));
        drvinfo->n_priv_flags = I40E_PRIV_FLAGS_STR_LEN;
        if (pf->hw.pf_id == 0)
-               drvinfo->n_priv_flags = I40E_PRIV_FLAGS_GL_STR_LEN;
-       else
-               drvinfo->n_priv_flags = I40E_PRIV_FLAGS_STR_LEN;
+               drvinfo->n_priv_flags += I40E_GL_PRIV_FLAGS_STR_LEN;
 }
 
 static void i40e_get_ringparam(struct net_device *netdev,
@@ -1426,10 +1420,8 @@ static int i40e_get_sset_count(struct net_device *netdev, int sset)
                        return I40E_VSI_STATS_LEN(netdev);
                }
        case ETH_SS_PRIV_FLAGS:
-               if (pf->hw.pf_id == 0)
-                       return I40E_PRIV_FLAGS_GL_STR_LEN;
-               else
-                       return I40E_PRIV_FLAGS_STR_LEN;
+               return I40E_PRIV_FLAGS_STR_LEN +
+                       (pf->hw.pf_id == 0 ? I40E_GL_PRIV_FLAGS_STR_LEN : 0);
        default:
                return -EOPNOTSUPP;
        }
@@ -1621,15 +1613,14 @@ 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_PRIV_FLAGS_GL_STR_LEN; i++) {
-                               memcpy(data, i40e_priv_flags_strings_gl[i],
-                                      ETH_GSTRING_LEN);
-                               data += ETH_GSTRING_LEN;
-                       }
-               } else {
-                       for (i = 0; i < I40E_PRIV_FLAGS_STR_LEN; i++) {
-                               memcpy(data, i40e_priv_flags_strings[i],
+                       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;
                        }