]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net: mediatek: fix threshold value
authorJohn Crispin <john@phrozen.org>
Fri, 10 Jun 2016 11:28:04 +0000 (13:28 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:29:29 +0000 (23:29 -0700)
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>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index e3dadae9f6dd7b3505fa0734e81143f7c9d1c4ef..032939d211a7c6a1257edf1d28eeb247becc4612 100644 (file)
@@ -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