1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4122553e224b..0e2d99c737e3 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1902,9 +1902,6 @@ static void bcm_sysport_netif_start(struct net_device *dev)
                 intrl2_1_mask_clear(priv, 0xffffffff);
         else
                 intrl2_0_mask_clear(priv, INTRL2_0_TDMA_MBDONE_MASK);
-
-        /* Last call before we start the real business */
-        netif_tx_start_all_queues(dev);
 }
 
 static void rbuf_init(struct bcm_sysport_priv *priv)
@@ -2048,6 +2045,8 @@ static int bcm_sysport_open(struct net_device *dev)
 
         bcm_sysport_netif_start(dev);
 
+        netif_tx_start_all_queues(dev);
+
         return 0;
 
 out_clear_rx_int:
@@ -2071,7 +2070,7 @@ static void bcm_sysport_netif_stop(struct net_device *dev)
         struct bcm_sysport_priv *priv = netdev_priv(dev);
 
         /* stop all software from updating hardware */
-        netif_tx_stop_all_queues(dev);
+        netif_tx_disable(dev);
         napi_disable(&priv->napi);
         cancel_work_sync(&priv->dim.dim.work);
         phy_stop(dev->phydev);
@@ -2658,12 +2657,12 @@ static int __maybe_unused bcm_sysport_suspend(struct device *d)
         if (!netif_running(dev))
                 return 0;
 
+        netif_device_detach(dev);
+
         bcm_sysport_netif_stop(dev);
 
         phy_suspend(dev->phydev);
 
-        netif_device_detach(dev);
-
         /* Disable UniMAC RX */
         umac_enable_set(priv, CMD_RX_EN, 0);
 
@@ -2746,8 +2745,6 @@ static int __maybe_unused bcm_sysport_resume(struct device *d)
                 goto out_free_rx_ring;
         }
 
-        netif_device_attach(dev);
-
         /* RX pipe enable */
         topctrl_writel(priv, 0, RX_FLUSH_CNTL);
 
@@ -2788,6 +2785,8 @@ static int __maybe_unused bcm_sysport_resume(struct device *d)
 
         bcm_sysport_netif_start(dev);
 
+        netif_device_attach(dev);
+
         return 0;
 
 out_free_rx_ring: