summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShannon Nelson <snelson@pensando.io>2020-07-20 16:00:16 -0700
committerDavid S. Miller <davem@davemloft.net>2020-07-20 18:09:38 -0700
commitbdff46665ee655600d0fe2a0e5f62ec7853d3b22 (patch)
treed0086b933169bb4dda62da183a8f133fc34cc272
parentcc4428c4de8c31f12e4690d0409e0432fe05702f (diff)
downloadlinux-bdff46665ee655600d0fe2a0e5f62ec7853d3b22.tar.gz
linux-bdff46665ee655600d0fe2a0e5f62ec7853d3b22.tar.bz2
linux-bdff46665ee655600d0fe2a0e5f62ec7853d3b22.zip
ionic: keep rss hash after fw update
Make sure the RSS hash key is kept across a fw update by not de-initing it when an update is happening. Fixes: c672412f6172 ("ionic: remove lifs on fw reset") Signed-off-by: Shannon Nelson <snelson@pensando.io> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/pensando/ionic/ionic_lif.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index 41e86d6b76b6..ddb9ad5b294c 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -2277,11 +2277,10 @@ static void ionic_lif_deinit(struct ionic_lif *lif)
cancel_work_sync(&lif->deferred.work);
cancel_work_sync(&lif->tx_timeout_work);
ionic_rx_filters_deinit(lif);
+ if (lif->netdev->features & NETIF_F_RXHASH)
+ ionic_lif_rss_deinit(lif);
}
- if (lif->netdev->features & NETIF_F_RXHASH)
- ionic_lif_rss_deinit(lif);
-
napi_disable(&lif->adminqcq->napi);
ionic_lif_qcq_deinit(lif, lif->notifyqcq);
ionic_lif_qcq_deinit(lif, lif->adminqcq);