aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-03 14:46:59 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 00:25:25 +0200
commit752cd29904c9304125005b34354b75b968bfc449 (patch)
treed3ae84605ec5662eb77b49e7886971c61c0dfb48 /target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch
parentda77b9c2f185db72a2917aa2e18f0c8bb164d3c4 (diff)
downloadupstream-752cd29904c9304125005b34354b75b968bfc449.tar.gz
upstream-752cd29904c9304125005b34354b75b968bfc449.tar.bz2
upstream-752cd29904c9304125005b34354b75b968bfc449.zip
kernel: bump 5.4 to 5.4.124
Manually rebased: generic/hack-5.4/662-remove_pfifo_fast.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [manual changes to ramips/patches-5.10/835-asoc-add-mt7620-support.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch')
-rw-r--r--target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch b/target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch
index 967502f022..297175855b 100644
--- a/target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch
+++ b/target/linux/generic/backport-5.4/771-v5.12-net-dsa-be-louder-when-a-non-legacy-FDB-operation-fa.patch
@@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
-@@ -1590,7 +1590,9 @@ static void dsa_slave_switchdev_event_wo
+@@ -1592,7 +1592,9 @@ static void dsa_slave_switchdev_event_wo
err = dsa_port_fdb_add(dp, fdb_info->addr, fdb_info->vid);
if (err) {
@@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
break;
}
fdb_info->offloaded = true;
-@@ -1605,9 +1607,11 @@ static void dsa_slave_switchdev_event_wo
+@@ -1607,9 +1609,11 @@ static void dsa_slave_switchdev_event_wo
err = dsa_port_fdb_del(dp, fdb_info->addr, fdb_info->vid);
if (err) {