summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShannon Nelson <snelson@pensando.io>2020-06-16 04:14:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-22 10:34:28 +0300
commit1c547524c9d0c6fbc42f8133ea7ed26b0253a41b (patch)
tree063b0149b55cd763c94293c5849e3c382ee03bf3
parente59515ce46a9af79dbf0e5b4bef6f04fc697aebb (diff)
downloadlinux-1c547524c9d0c6fbc42f8133ea7ed26b0253a41b.tar.xz
ionic: no link check while resetting queues
commit 3103b6feb4454646558eedc50ece728bc469f341 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/pensando/ionic/ionic_lif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index b591bec0301c..44c1023549c3 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -85,7 +85,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;
if (lif->ionic->is_mgmt_nic)