[PATCH 5.10 049/103] ionic: start queues before announcing link up

[Greg Kroah-Hartman]

From: Shannon Nelson <snel...@pensando.io>

commit 8f56bc4dc1011be6e2a53198b615fdc588b4ef6a upstream.

Change the order of operations in the link_up handling to be
sure that the queues are up and ready before we announce that
the link is up.

Signed-off-by: Shannon Nelson <snel...@pensando.io>
Reviewed-by: Saeed Mahameed <sae...@nvidia.com>
Signed-off-by: Jakub Kicinski <k...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/ethernet/pensando/ionic/ionic_lif.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -123,6 +123,12 @@ static void ionic_link_status_check(stru
        link_up = link_status == IONIC_PORT_OPER_STATUS_UP;
 
        if (link_up) {
+               if (lif->netdev->flags & IFF_UP && netif_running(lif->netdev)) {
+                       mutex_lock(&lif->queue_lock);
+                       ionic_start_queues(lif);
+                       mutex_unlock(&lif->queue_lock);
+               }
+
                if (!netif_carrier_ok(netdev)) {
                        u32 link_speed;
 
@@ -132,12 +138,6 @@ static void ionic_link_status_check(stru
                                    link_speed / 1000);
                        netif_carrier_on(netdev);
                }
-
-               if (lif->netdev->flags & IFF_UP && netif_running(lif->netdev)) {
-                       mutex_lock(&lif->queue_lock);
-                       ionic_start_queues(lif);
-                       mutex_unlock(&lif->queue_lock);
-               }
        } else {
                if (netif_carrier_ok(netdev)) {
                        netdev_info(netdev, "Link down\n");