aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-5.4/0999-hnat.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2020-09-09 11:51:21 +0200
committerFelix Fietkau <nbd@nbd.name>2020-09-09 11:51:47 +0200
commit668c988fc5e1d028dc1b9dfed8ed332b0a9073c8 (patch)
tree8b26ba7fbd837bbf6009e04c4009d2ee426bdfa9 /target/linux/mediatek/patches-5.4/0999-hnat.patch
parentd717343c85f6c305b6896e4d3aa93f9cd67e9d22 (diff)
downloadupstream-668c988fc5e1d028dc1b9dfed8ed332b0a9073c8.tar.gz
upstream-668c988fc5e1d028dc1b9dfed8ed332b0a9073c8.tar.bz2
upstream-668c988fc5e1d028dc1b9dfed8ed332b0a9073c8.zip
mediatek/ramips: remove an ethernet optimization patch that was reported to cause a regression
In some tests, crashes were observed Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0999-hnat.patch')
-rw-r--r--target/linux/mediatek/patches-5.4/0999-hnat.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches-5.4/0999-hnat.patch b/target/linux/mediatek/patches-5.4/0999-hnat.patch
index cd0ad54c7e..50850a906e 100644
--- a/target/linux/mediatek/patches-5.4/0999-hnat.patch
+++ b/target/linux/mediatek/patches-5.4/0999-hnat.patch
@@ -147,7 +147,7 @@
#include "mtk_eth_soc.h"
-@@ -1319,8 +1321,16 @@ static int mtk_poll_rx(struct napi_struc
+@@ -1320,8 +1322,16 @@ static int mtk_poll_rx(struct napi_struc
(trxd.rxd2 & RX_DMA_VTAG))
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
RX_DMA_VID(trxd.rxd3));
@@ -166,7 +166,7 @@
skip_rx:
ring->data[idx] = new_data;
-@@ -2251,6 +2261,9 @@ static int mtk_open(struct net_device *d
+@@ -2255,6 +2265,9 @@ static int mtk_open(struct net_device *d
mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
mtk_rx_irq_enable(eth, MTK_RX_DONE_INT);
refcount_set(&eth->dma_refcnt, 1);
@@ -176,7 +176,7 @@
}
else
refcount_inc(&eth->dma_refcnt);
-@@ -2312,6 +2325,9 @@ static int mtk_stop(struct net_device *d
+@@ -2316,6 +2329,9 @@ static int mtk_stop(struct net_device *d
mtk_dma_free(eth);
@@ -186,7 +186,7 @@
return 0;
}
-@@ -2825,6 +2841,27 @@ static int mtk_set_rxnfc(struct net_devi
+@@ -2829,6 +2845,27 @@ static int mtk_set_rxnfc(struct net_devi
return ret;
}
@@ -214,7 +214,7 @@
static const struct ethtool_ops mtk_ethtool_ops = {
.get_link_ksettings = mtk_get_link_ksettings,
.set_link_ksettings = mtk_set_link_ksettings,
-@@ -2856,6 +2893,9 @@ static const struct net_device_ops mtk_n
+@@ -2860,6 +2897,9 @@ static const struct net_device_ops mtk_n
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = mtk_poll_controller,
#endif
@@ -224,7 +224,7 @@
};
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
-@@ -3198,6 +3238,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3202,6 +3242,7 @@ static const struct mtk_soc_data mt7622_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7622_CLKS_BITMAP,
.required_pctl = false,