projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.20
[openwrt/openwrt.git]
/
target
/
linux
/
mediatek
/
patches-4.14
/
0035-net-mediatek-disable-RX-VLan-offloading.patch
diff --git
a/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
b/target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
index 36321c55cf525b7bde4cc4080755e6fb51aac11c..07f8206ead98bd7c6a67b396e72e8af9d6383b9f 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
+++ b/
target/linux/mediatek/patches-4.14/0035-net-mediatek-disable-RX-VLan-offloading.patch
@@
-11,7
+11,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -
643,8 +643
,8 @@ static int mtk_tx_map(struct sk_buff *sk
+@@ -
709,8 +709
,8 @@ static int mtk_tx_map(struct sk_buff *sk
txd4 |= TX_DMA_CHKSUM;
/* VLAN header offload */
txd4 |= TX_DMA_CHKSUM;
/* VLAN header offload */
@@
-22,7
+22,7
@@
Signed-off-by: John Crispin <john@phrozen.org>
mapped_addr = dma_map_single(eth->dev, skb->data,
skb_headlen(skb), DMA_TO_DEVICE);
mapped_addr = dma_map_single(eth->dev, skb->data,
skb_headlen(skb), DMA_TO_DEVICE);
-@@ -1
874,7 +1874
,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -1
979,7 +1979
,10 @@ static int mtk_hw_init(struct mtk_eth *e
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
/* Enable RX VLan Offloading */
mtk_w32(eth, val | MTK_CDMQ_STAG_EN, MTK_CDMQ_IG_CTRL);
/* Enable RX VLan Offloading */
@@
-32,8
+32,8
@@
Signed-off-by: John Crispin <john@phrozen.org>
+ else
+ mtk_w32(eth, 0, MTK_CDMP_EG_CTRL);
+ else
+ mtk_w32(eth, 0, MTK_CDMP_EG_CTRL);
- /*
disable delay and normal interrupt
*/
- mtk_w32(eth,
0, MTK_Q
DMA_DELAY_INT);
+ /*
enable interrupt delay for RX
*/
+ mtk_w32(eth,
MTK_PDMA_DELAY_RX_DELAY, MTK_P
DMA_DELAY_INT);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -34,8 +34,6 @@
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -34,8 +34,6 @@