Commit 16ef6707 authored by Felix Fietkau's avatar Felix Fietkau Committed by David S. Miller
Browse files

net: ethernet: mtk_eth_soc: remove unnecessary TX queue stops 



When running short on descriptors, only stop the queue for the netdev that
tx was attempted for. By the time something tries to send on the other
netdev, the ring might have some more room already.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3630d519

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −13
Original line number Diff line number Diff line
@@ -1131,17 +1131,6 @@ static void mtk_wake_queue(struct mtk_eth *eth) 
	}

}



static void mtk_stop_queue(struct mtk_eth *eth)

{

	int i;



	for (i = 0; i < MTK_MAC_COUNT; i++) {

		if (!eth->netdev[i])

			continue;

		netif_stop_queue(eth->netdev[i]);

	}

}



static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct mtk_mac *mac = netdev_priv(dev);
@@ -1162,7 +1151,7 @@ static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	tx_num = mtk_cal_txd_req(skb);

	if (unlikely(atomic_read(&ring->free_count) <= tx_num)) {

		mtk_stop_queue(eth);

		netif_stop_queue(dev);

		netif_err(eth, tx_queued, dev,

			  "Tx Ring full when queue awake!\n");

		spin_unlock(&eth->page_lock);
@@ -1188,7 +1177,7 @@ static netdev_tx_t mtk_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto drop;



	if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))

		mtk_stop_queue(eth);

		netif_stop_queue(dev);



	spin_unlock(&eth->page_lock);