i40e: fix link checking logic

If the interface is closed, but VFs exist, current code will spam all
the VFs with link messages every second. This is because the link event
code was looking at netif_carrier_ok() without checking to see if the
interface was actually open.

Refactor the logic to only check the carrier state if the interface is
actually open. This allows link changes to be reported correctly without
spamming the VFs.

Change-ID: If136e79bb3820d21ea4e39e332e8a9604efc2b2a
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Patrick Lu <patrick.lu@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 0eccd82227279d049dae2e412c7bf95ce10651ab..f95c04a906dd1b79c9ec859be8f118f8b513dc4e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5358,6 +5358,7 @@ static void i40e_veb_link_event(struct i40e_veb *veb, bool link_up)
 static void i40e_link_event(struct i40e_pf *pf)
 {
        bool new_link, old_link;
+       struct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];
 
        /* set this to force the get_link_status call to refresh state */
        pf->hw.phy.get_link_info = true;
@@ -5366,10 +5367,12 @@ static void i40e_link_event(struct i40e_pf *pf)
        new_link = i40e_get_link_status(&pf->hw);
 
        if (new_link == old_link &&
-           new_link == netif_carrier_ok(pf->vsi[pf->lan_vsi]->netdev))
+           (test_bit(__I40E_DOWN, &vsi->state) ||
+            new_link == netif_carrier_ok(vsi->netdev)))
                return;
-       if (!test_bit(__I40E_DOWN, &pf->vsi[pf->lan_vsi]->state))
-               i40e_print_link_message(pf->vsi[pf->lan_vsi], new_link);
+
+       if (!test_bit(__I40E_DOWN, &vsi->state))
+               i40e_print_link_message(vsi, new_link);
 
        /* Notify the base of the switch tree connected to
         * the link.  Floating VEBs are not notified.
@@ -5377,7 +5380,7 @@ static void i40e_link_event(struct i40e_pf *pf)
        if (pf->lan_veb != I40E_NO_VEB && pf->veb[pf->lan_veb])
                i40e_veb_link_event(pf->veb[pf->lan_veb], new_link);
        else
-               i40e_vsi_link_event(pf->vsi[pf->lan_vsi], new_link);
+               i40e_vsi_link_event(vsi, new_link);
 
        if (pf->vf)
                i40e_vc_notify_link_state(pf);