0401-eth-fix-eth1-tx-timeout.patch 1 KB
Newer Older
Petr Štetiar's avatar
Petr Štetiar committed
1
2
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
Petr Štetiar's avatar
Petr Štetiar committed
3
@@ -1112,17 +1112,6 @@ static void mtk_wake_queue(struct mtk_et
John Crispin's avatar
John Crispin committed
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
 	}
 }
 
-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 int mtk_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct mtk_mac *mac = netdev_priv(dev);
Petr Štetiar's avatar
Petr Štetiar committed
21
@@ -1143,7 +1132,7 @@ static int mtk_start_xmit(struct sk_buff
John Crispin's avatar
John Crispin committed
22
23
24
25
26
27
28
29
 
 	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);
Petr Štetiar's avatar
Petr Štetiar committed
30
@@ -1169,7 +1158,7 @@ static int mtk_start_xmit(struct sk_buff
John Crispin's avatar
John Crispin committed
31
32
33
34
35
36
37
38
 		goto drop;
 
 	if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
-		mtk_stop_queue(eth);
+		netif_stop_queue(dev);
 
 	spin_unlock(&eth->page_lock);