projects
/
openwrt
/
staging
/
nbd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 6.1 to 6.1.83
[openwrt/staging/nbd.git]
/
target
/
linux
/
generic
/
backport-6.1
/
730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
diff --git
a/target/linux/generic/backport-6.1/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
b/target/linux/generic/backport-6.1/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
index 8da728b9e9d479401eb3fbd7a689f9bdbc96ff6d..30c32d5cce0411bf9515bead770132515b172c94 100644
(file)
--- a/
target/linux/generic/backport-6.1/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
+++ b/
target/linux/generic/backport-6.1/730-13-v6.3-net-ethernet-mtk_eth_soc-enable-special-tag-when-any.patch
@@
-23,7
+23,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- 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
-@@ -313
6,7 +3136
,7 @@ static void mtk_gdm_config(struct mtk_et
+@@ -313
5,7 +3135
,7 @@ static void mtk_gdm_config(struct mtk_et
val |= config;
val |= config;
@@
-32,7
+32,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
val |= MTK_GDMA_SPECIAL_TAG;
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
val |= MTK_GDMA_SPECIAL_TAG;
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
-@@ -320
1,8 +3201
,7 @@ static int mtk_open(struct net_device *d
+@@ -320
0,8 +3200
,7 @@ static int mtk_open(struct net_device *d
struct mtk_eth *eth = mac->hw;
int i, err;
struct mtk_eth *eth = mac->hw;
int i, err;
@@
-42,7
+42,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
struct metadata_dst *md_dst = eth->dsa_meta[i];
for (i = 0; i < ARRAY_SIZE(eth->dsa_meta); i++) {
struct metadata_dst *md_dst = eth->dsa_meta[i];
-@@ -321
9,8 +3218
,7 @@ static int mtk_open(struct net_device *d
+@@ -321
8,8 +3217
,7 @@ static int mtk_open(struct net_device *d
}
} else {
/* Hardware special tag parsing needs to be disabled if at least
}
} else {
/* Hardware special tag parsing needs to be disabled if at least