Date: Thu, 18 Jun 2020 19:42:50 -0400 From: Jonathan Toppins To: rhkernel-list@redhat.com Cc: darcari@redhat.com, nhorman@redhat.com, linville@redhat.com Subject: [PATCH RHEL-8.3 15/16] ionic: no link check while resetting queues 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 Acked-by: Jonathan Toppins Signed-off-by: David S. Miller (cherry picked from commit 3103b6feb4454646558eedc50ece728bc469f341) Bugzilla: 1846953 Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29498383 Tested: QE tested devel kernel as well as the partner Signed-off-by: Jonathan Toppins --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 7cc1ef657b10..8f29ef133743 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -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); -- 2.16.4