[net-next 03/11] i40e: calculate ethtool stats size in a separate function

[Jeff Kirsher]

From: Jacob Keller <jacob.e.kel...@intel.com>

Use a separate function to calculate the number of stats for
a particular device. This helps reduce the clutter in
i40e_get_sset_count().

Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com>
Tested-by: Andrew Bowers <andrewx.bow...@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com>
---
 .../net/ethernet/intel/i40e/i40e_ethtool.c    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c 
b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index fc6a5eef141c..a62142f033d2 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1658,6 +1658,23 @@ static int i40e_set_ringparam(struct net_device *netdev,
        return err;
 }
 
+static int i40e_get_stats_count(struct net_device *netdev)
+{
+       struct i40e_netdev_priv *np = netdev_priv(netdev);
+       struct i40e_vsi *vsi = np->vsi;
+       struct i40e_pf *pf = vsi->back;
+
+       if (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id == 1) {
+               if (pf->lan_veb != I40E_NO_VEB &&
+                   pf->flags & I40E_FLAG_VEB_STATS_ENABLED)
+                       return I40E_PF_STATS_LEN(netdev) + I40E_VEB_STATS_TOTAL;
+               else
+                       return I40E_PF_STATS_LEN(netdev);
+       } else {
+               return I40E_VSI_STATS_LEN(netdev);
+       }
+}
+
 static int i40e_get_sset_count(struct net_device *netdev, int sset)
 {
        struct i40e_netdev_priv *np = netdev_priv(netdev);
@@ -1668,16 +1685,7 @@ static int i40e_get_sset_count(struct net_device 
*netdev, int sset)
        case ETH_SS_TEST:
                return I40E_TEST_LEN;
        case ETH_SS_STATS:
-               if (vsi == pf->vsi[pf->lan_vsi] && pf->hw.partition_id == 1) {
-                       int len = I40E_PF_STATS_LEN(netdev);
-
-                       if ((pf->lan_veb != I40E_NO_VEB) &&
-                           (pf->flags & I40E_FLAG_VEB_STATS_ENABLED))
-                               len += I40E_VEB_STATS_TOTAL;
-                       return len;
-               } else {
-                       return I40E_VSI_STATS_LEN(netdev);
-               }
+               return i40e_get_stats_count(netdev);
        case ETH_SS_PRIV_FLAGS:
                return I40E_PRIV_FLAGS_STR_LEN +
                        (pf->hw.pf_id == 0 ? I40E_GL_PRIV_FLAGS_STR_LEN : 0);
-- 
2.17.0