mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
faf668be35
Refreshed patches. Run tested: qemu-x86-64, apalis, a64-olinuxino Build tested: x86/64, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1112,17 +1112,6 @@ static void mtk_wake_queue(struct mtk_et
|
|
}
|
|
}
|
|
|
|
-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);
|
|
@@ -1143,7 +1132,7 @@ static int mtk_start_xmit(struct sk_buff
|
|
|
|
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(ð->page_lock);
|
|
@@ -1169,7 +1158,7 @@ static int mtk_start_xmit(struct sk_buff
|
|
goto drop;
|
|
|
|
if (unlikely(atomic_read(&ring->free_count) <= ring->thresh))
|
|
- mtk_stop_queue(eth);
|
|
+ netif_stop_queue(dev);
|
|
|
|
spin_unlock(ð->page_lock);
|
|
|