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
/
0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
diff --git
a/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
b/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
index 4f2c7b2e6ee7593c7c16b867c150c6974cde3bf2..8163e4475d57b2ac444773ff437ac8e7ae655a0d 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
+++ b/
target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
@@
-17,7
+17,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
-@@ -9
33,10 +933
,16 @@ static int mtk_poll_rx(struct napi_struc
+@@ -9
99,10 +999
,16 @@ static int mtk_poll_rx(struct napi_struc
if (!(trxd.rxd2 & RX_DMA_DONE))
break;
if (!(trxd.rxd2 & RX_DMA_DONE))
break;
@@
-36,11
+36,11
@@
Signed-off-by: John Crispin <john@phrozen.org>
+ mac--;
+ }
+ mac--;
+ }
- netdev = eth->netdev[mac];
-
+ if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT ||
+ !eth->netdev[mac]))
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -28
4,6 +284
,7 @@
+@@ -28
7,6 +287
,7 @@
/* QDMA descriptor rxd4 */
#define RX_DMA_L4_VALID BIT(24)
/* QDMA descriptor rxd4 */
#define RX_DMA_L4_VALID BIT(24)