1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index dbd6fffd9b85..d4461eec26bd 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -11331,16 +11331,15 @@ static int i40e_sw_init(struct i40e_pf *pf)
                 /* IWARP needs one extra vector for CQP just like MISC.*/
                 pf->num_iwarp_msix = (int)num_online_cpus() + 1;
         }
-        /* Stopping the FW LLDP engine is only supported on the
-         * XL710 with a FW ver >= 1.7.  Also, stopping FW LLDP
-         * engine is not supported if NPAR is functioning on this
-         * part
+        /* Stopping FW LLDP engine is supported on XL710 and X722
+         * starting from FW versions determined in i40e_init_adminq.
+         * Stopping the FW LLDP engine is not supported on XL710
+         * if NPAR is functioning so unset this hw flag in this case.
          */
         if (pf->hw.mac.type == I40E_MAC_XL710 &&
-            !pf->hw.func_caps.npar_enable &&
-            (pf->hw.aq.api_maj_ver > 1 ||
-             (pf->hw.aq.api_maj_ver == 1 && pf->hw.aq.api_min_ver > 6)))
-                pf->hw_features |= I40E_HW_STOPPABLE_FW_LLDP;
+            pf->hw.func_caps.npar_enable &&
+            (pf->hw.flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE))
+                pf->hw.flags &= ~I40E_HW_FLAG_FW_LLDP_STOPPABLE;
 
 #ifdef CONFIG_PCI_IOV
         if (pf->hw.func_caps.num_vfs && pf->hw.partition_id == 1) {