From: Aashish Verma <aashishx.ve...@intel.com>

netif_set_real_num_tx_queues() & netif_set_real_num_rx_queues() should be
used to inform network stack about the real Tx & Rx queue (active) number
in both stmmac_open() and stmmac_resume(), therefore, we move the code
from stmmac_dvr_probe() to stmmac_hw_setup().

Fixes: c02b7a914551 net: stmmac: use netif_set_real_num_{rx,tx}_queues

Signed-off-by: Aashish Verma <aashishx.ve...@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong....@intel.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 9302d8012a10..fea3b77892ab 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2733,6 +2733,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool 
init_ptp)
                stmmac_enable_tbs(priv, priv->ioaddr, enable, chan);
        }
 
+       /* Configure real RX and TX queues */
+       netif_set_real_num_rx_queues(dev, priv->plat->rx_queues_to_use);
+       netif_set_real_num_tx_queues(dev, priv->plat->tx_queues_to_use);
+
        /* Start the ball rolling... */
        stmmac_start_all_dma(priv);
 
@@ -4883,10 +4887,6 @@ int stmmac_dvr_probe(struct device *device,
 
        stmmac_check_ether_addr(priv);
 
-       /* Configure real RX and TX queues */
-       netif_set_real_num_rx_queues(ndev, priv->plat->rx_queues_to_use);
-       netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use);
-
        ndev->netdev_ops = &stmmac_netdev_ops;
 
        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-- 
2.17.0

Reply via email to