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: bump 6.1 to 6.1.54
[openwrt/staging/jow.git]
/
target
/
linux
/
generic
/
backport-6.1
/
729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
diff --git
a/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
b/target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
index b8b3a1a181cf55abdd8ecc0a709a6a7fdd95c1ec..da1ce24b8ffe4b61950934f850cf991661a304f4 100644
(file)
--- a/
target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
+++ b/
target/linux/generic/backport-6.1/729-22-v6.3-net-ethernet-mtk_wed-add-reset-reset_complete-callba.patch
@@
-14,7
+14,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- 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
-@@ -368
6,6 +3686
,11 @@ static void mtk_pending_work(struct work
+@@ -368
9,6 +3689
,11 @@ static void mtk_pending_work(struct work
set_bit(MTK_RESETTING, ð->state);
mtk_prepare_for_reset(eth);
set_bit(MTK_RESETTING, ð->state);
mtk_prepare_for_reset(eth);
@@
-26,7
+26,7
@@
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/* stop all devices to make sure that dma is properly shut down */
for (i = 0; i < MTK_MAC_COUNT; i++) {
/* stop all devices to make sure that dma is properly shut down */
for (i = 0; i < MTK_MAC_COUNT; i++) {
-@@ -372
3,6 +3728
,8 @@ static void mtk_pending_work(struct work
+@@ -372
6,6 +3731
,8 @@ static void mtk_pending_work(struct work
clear_bit(MTK_RESETTING, ð->state);
clear_bit(MTK_RESETTING, ð->state);