Commit 686cff3d authored by Aashish Verma's avatar Aashish Verma Committed by David S. Miller
Browse files

net: stmmac: Fix incorrect location to set real_num_rx|tx_queues 



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: c02b7a91 net: stmmac: use netif_set_real_num_{rx,tx}_queues

Signed-off-by: default avatarAashish Verma <aashishx.verma@intel.com>
Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0366f7e0

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −4
Original line number Diff line number Diff line
@@ -2732,6 +2732,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);
@@ -4882,10 +4886,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 |

CRA Git | Maintained and supported by SUSTech CRA and CCSE