projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: backport phylink changes from mainline Linux
[openwrt/staging/jow.git]
/
target
/
linux
/
generic
/
backport-6.1
/
730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
diff --git
a/target/linux/generic/backport-6.1/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
b/target/linux/generic/backport-6.1/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
index 42c745d02fa9a0d34dc2951cf45e7b0f8ebc17c9..a88df2b8e3a22755e529e5d4a61095b1025eba07 100644
(file)
--- a/
target/linux/generic/backport-6.1/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
+++ b/
target/linux/generic/backport-6.1/730-12-v6.3-net-ethernet-mtk_eth_soc-disable-hardware-DSA-untagg.patch
@@
-20,7
+20,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.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
-@@ -320
2,7 +3202
,8 @@ static int mtk_open(struct net_device *d
+@@ -320
1,7 +3201
,8 @@ 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;
@@
-30,7
+30,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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,7 +3220
,8 @@ static int mtk_open(struct net_device *d
+@@ -321
8,7 +3219
,8 @@ 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