Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b54e0f authored by Ong Boon Leong's avatar Ong Boon Leong Committed by Greg Kroah-Hartman
Browse files

net: stmmac: use netif_tx_start|stop_all_queues() function 



[ Upstream commit 9f19306d166688a73356aa636c62e698bf2063cc ]

The current implementation of stmmac_stop_all_queues() and
stmmac_start_all_queues() will not work correctly when the value of
tx_queues_to_use is changed through ethtool -L DEVNAME rx N tx M command.

Also, netif_tx_start|stop_all_queues() are only needed in driver open()
and close() only.

Fixes: c22a3f48 net: stmmac: adding multiple napi mechanism

Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 85c4859b

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

+1 −32
Original line number Diff line number Diff line
@@ -177,32 +177,6 @@ static void stmmac_enable_all_queues(struct stmmac_priv *priv) 
	}

}



/**

 * stmmac_stop_all_queues - Stop all queues

 * @priv: driver private structure

 */

static void stmmac_stop_all_queues(struct stmmac_priv *priv)

{

	u32 tx_queues_cnt = priv->plat->tx_queues_to_use;

	u32 queue;



	for (queue = 0; queue < tx_queues_cnt; queue++)

		netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, queue));

}



/**

 * stmmac_start_all_queues - Start all queues

 * @priv: driver private structure

 */

static void stmmac_start_all_queues(struct stmmac_priv *priv)

{

	u32 tx_queues_cnt = priv->plat->tx_queues_to_use;

	u32 queue;



	for (queue = 0; queue < tx_queues_cnt; queue++)

		netif_tx_start_queue(netdev_get_tx_queue(priv->dev, queue));

}



static void stmmac_service_event_schedule(struct stmmac_priv *priv)

{

	if (!test_bit(STMMAC_DOWN, &priv->state) &&
@@ -2678,7 +2652,7 @@ static int stmmac_open(struct net_device *dev) 
	}



	stmmac_enable_all_queues(priv);

	stmmac_start_all_queues(priv);

	netif_tx_start_all_queues(priv->dev);



	return 0;
@@ -2724,8 +2698,6 @@ static int stmmac_release(struct net_device *dev) 
		phy_disconnect(dev->phydev);

	}



	stmmac_stop_all_queues(priv);



	stmmac_disable_all_queues(priv);



	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
@@ -4519,7 +4491,6 @@ int stmmac_suspend(struct device *dev) 
	mutex_lock(&priv->lock);



	netif_device_detach(ndev);

	stmmac_stop_all_queues(priv);



	stmmac_disable_all_queues(priv);
@@ -4628,8 +4599,6 @@ int stmmac_resume(struct device *dev) 


	stmmac_enable_all_queues(priv);



	stmmac_start_all_queues(priv);



	mutex_unlock(&priv->lock);



	if (ndev->phydev)