]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ionic: no link check while resetting queues
authorShannon Nelson <snelson@pensando.io>
Tue, 16 Jun 2020 01:14:59 +0000 (18:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jun 2020 22:07:01 +0000 (15:07 -0700)
If the driver is busy resetting queues after a change in
MTU or queue parameters, don't bother checking the link,
wait until the next watchdog cycle.

Fixes: 987c0871e8ae ("ionic: check for linkup in watchdog")
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Acked-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_lif.c

index 9d8c969f21cbf9d2a0f62094103f54e9c6599168..bfadc493470218c50083b6a615aa17e33f51de2e 100644 (file)
@@ -96,7 +96,8 @@ static void ionic_link_status_check(struct ionic_lif *lif)
        u16 link_status;
        bool link_up;
 
-       if (!test_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state))
+       if (!test_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state) ||
+           test_bit(IONIC_LIF_F_QUEUE_RESET, lif->state))
                return;
 
        link_status = le16_to_cpu(lif->info->status.link_status);