projects
/
openwrt
/
staging
/
ynezz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.4 to 5.4.124
[openwrt/staging/ynezz.git]
/
target
/
linux
/
generic
/
backport-5.4
/
773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
diff --git
a/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
b/target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
index 619c71c7bb8fdd236d8976506727bc9567b2db5e..b46cd7545e135380452dcb874e91b7db1c662d50 100644
(file)
--- a/
target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
+++ b/
target/linux/generic/backport-5.4/773-v5.12-net-dsa-move-switchdev-event-implementation-under-th.patch
@@
-20,7
+20,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
-@@ -163
7,31 +1637
,29 @@ static int dsa_slave_switchdev_event(str
+@@ -163
9,31 +1639
,29 @@ static int dsa_slave_switchdev_event(str
struct dsa_port *dp;
int err;
struct dsa_port *dp;
int err;
@@
-68,7
+68,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
fdb_info = ptr;
if (!fdb_info->added_by_user) {
fdb_info = ptr;
if (!fdb_info->added_by_user) {
-@@ -167
4,13 +1672
,12 @@ static int dsa_slave_switchdev_event(str
+@@ -167
6,13 +1674
,12 @@ static int dsa_slave_switchdev_event(str
switchdev_work->vid = fdb_info->vid;
dev_hold(dev);
switchdev_work->vid = fdb_info->vid;
dev_hold(dev);