1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 6a97ddbbda76..f7dd0bd03d39 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -155,7 +155,7 @@ struct ice_priv_flag {
 
 static const struct ice_priv_flag ice_gstrings_priv_flags[] = {
         ICE_PRIV_FLAG("link-down-on-close", ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA),
-        ICE_PRIV_FLAG("enable-fw-lldp", ICE_FLAG_ENABLE_FW_LLDP),
+        ICE_PRIV_FLAG("fw-lldp-agent", ICE_FLAG_FW_LLDP_AGENT),
 };
 
 #define ICE_PRIV_FLAG_ARRAY_SIZE        ARRAY_SIZE(ice_gstrings_priv_flags)
@@ -1201,8 +1201,8 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)
 
         bitmap_xor(change_flags, pf->flags, orig_flags, ICE_PF_FLAGS_NBITS);
 
-        if (test_bit(ICE_FLAG_ENABLE_FW_LLDP, change_flags)) {
-                if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags)) {
+        if (test_bit(ICE_FLAG_FW_LLDP_AGENT, change_flags)) {
+                if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags)) {
                         enum ice_status status;
 
                         /* Disable FW LLDP engine */
@@ -1319,14 +1319,17 @@ ice_get_ethtool_stats(struct net_device *netdev,
         struct ice_vsi *vsi = np->vsi;
         struct ice_pf *pf = vsi->back;
         struct ice_ring *ring;
-        unsigned int j = 0;
+        unsigned int j;
         int i = 0;
         char *p;
 
+        ice_update_pf_stats(pf);
+        ice_update_vsi_stats(vsi);
+
         for (j = 0; j < ICE_VSI_STATS_LEN; j++) {
                 p = (char *)vsi + ice_gstrings_vsi_stats[j].stat_offset;
                 data[i++] = (ice_gstrings_vsi_stats[j].sizeof_stat ==
-                            sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
+                             sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
 
         /* populate per queue stats */