mediatek: update patches
[openwrt/openwrt.git] / target / linux / mediatek / patches-4.4 / 0091-net-next-mediatek-only-wake-the-queue-if-it-is-stopp.patch
1 From 1473b4cce85760c0202a08e6a48ec51867dc1bf7 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Tue, 3 May 2016 04:01:38 +0200
4 Subject: [PATCH 091/102] net-next: mediatek: only wake the queue if it is
5 stopped
6
7 The current code unconditionally wakes up the queue at the end of each
8 tx_poll action. Change the code to only wake up the queues if any of
9 them have actually been stopped before.
10
11 Signed-off-by: John Crispin <john@phrozen.org>
12 ---
13 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++++++++++++++++-
14 1 file changed, 16 insertions(+), 1 deletion(-)
15
16 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
17 index 87b48c0..9da533e 100644
18 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
19 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
20 @@ -716,6 +716,20 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb)
21 return nfrags;
22 }
23
24 +static int mtk_queue_stopped(struct mtk_eth *eth)
25 +{
26 + int i;
27 +
28 + for (i = 0; i < MTK_MAC_COUNT; i++) {
29 + if (!eth->netdev[i])
30 + continue;
31 + if (netif_queue_stopped(eth->netdev[i]))
32 + return 1;
33 + }
34 +
35 + return 0;
36 +}
37 +
38 static void mtk_wake_queue(struct mtk_eth *eth)
39 {
40 int i;
41 @@ -960,7 +974,8 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again)
42 if (!total)
43 return 0;
44
45 - if (atomic_read(&ring->free_count) > ring->thresh)
46 + if (mtk_queue_stopped(eth) &&
47 + (atomic_read(&ring->free_count) > ring->thresh))
48 mtk_wake_queue(eth);
49
50 return total;
51 --
52 1.7.10.4
53