Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[deliverable/linux.git] / drivers / net / ethernet / intel / fm10k / fm10k_pci.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index d4ccb2a0c585df93f943a0cfaa9f1f5417e79aa5..b8245c734c969442bd6aa5d999fcff9c194ed62d 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2158,6 +2158,10 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface)
        interface->host_ready = false;
        fm10k_watchdog_host_not_ready(interface);
 
+       /* force link to stay down for a second to prevent link flutter */
+       interface->link_down_event = jiffies + (HZ);
+       set_bit(__FM10K_LINK_DOWN, &interface->state);
+
        /* clear the service task disable bit to allow service task to start */
        clear_bit(__FM10K_SERVICE_DISABLE, &interface->state);
        fm10k_service_event_schedule(interface);