summary refs log tree commit diff
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-06-10 13:28:04 +0200
committerDavid S. Miller <davem@davemloft.net>2016-06-10 23:29:29 -0700
commit04698cccb1de54d5d97fda2e4a1c6ca365da0f70 (patch)
tree52c24dbba380abaa8caca3a18518be321042d1f8 /drivers/net
parent2ff0bb61646f286fa97db2904491974302a14f1f (diff)
downloadlinux-04698cccb1de54d5d97fda2e4a1c6ca365da0f70.tar.gz
net: mediatek: fix threshold value
The logic to calculate the threshold value for stopping the TX queue is
bad. Currently it will always use 1/2 of the rings size, which is way too
much. Set the threshold to MAX_SKB_FRAGS. This makes sure that the queue
is stopped when there is not enough room to accept an additional segment. 

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mediatek/mtk_eth_soc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index e3dadae9f6dd..032939d211a7 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1033,8 +1033,7 @@ static int mtk_tx_alloc(struct mtk_eth *eth)
 	atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
 	ring->next_free = &ring->dma[0];
 	ring->last_free = &ring->dma[MTK_DMA_SIZE - 2];
-	ring->thresh = max((unsigned long)MTK_DMA_SIZE >> 2,
-			      MAX_SKB_FRAGS);
+	ring->thresh = MAX_SKB_FRAGS;
 
 	/* make sure that all changes to the dma ring are flushed before we
 	 * continue