mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-04 06:54:27 -05:00
9664b41c05
Deleted (upstreamed): generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch generic/backport-5.10/792-v5.15-0001-net-dsa-b53-Fix-calculating-number-of-switch-ports.patch generic/backport-5.10/792-v5.15-0002-net-dsa-b53-Set-correct-number-of-ports-in-the-DSA-s.patch generic/backport-5.10/792-v5.15-0003-net-dsa-b53-Fix-IMP-port-setup-on-BCM5301x.patch generic/backport-5.10/840-0001-PCI-of-Don-t-fail-devm_pci_alloc_host_bridge-on-miss.patch generic/backport-5.10/840-0002-PCI-iproc-Fix-BCMA-probe-resource-handling.patch generic/pending-5.10/498-mtd-mtdconcat-select-readwrite-function.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From dd082716b43a3684b2f473ae5d1e76d1c076d86d Mon Sep 17 00:00:00 2001
|
|
From: Tobias Waldekranz <tobias@waldekranz.com>
|
|
Date: Sat, 16 Jan 2021 02:25:12 +0100
|
|
Subject: [PATCH] net: dsa: Include local addresses in assisted CPU port
|
|
learning
|
|
|
|
Add local addresses (i.e. the ports' MAC addresses) to the hardware
|
|
FDB when assisted CPU port learning is enabled.
|
|
|
|
NOTE: The bridge's own MAC address is also "local". If that address is
|
|
not shared with any port, the bridge's MAC is not be added by this
|
|
functionality - but the following commit takes care of that case.
|
|
|
|
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|
---
|
|
net/dsa/slave.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/net/dsa/slave.c
|
|
+++ b/net/dsa/slave.c
|
|
@@ -2192,10 +2192,12 @@ static int dsa_slave_switchdev_event(str
|
|
fdb_info = ptr;
|
|
|
|
if (dsa_slave_dev_check(dev)) {
|
|
- if (!fdb_info->added_by_user)
|
|
- return NOTIFY_OK;
|
|
-
|
|
dp = dsa_slave_to_port(dev);
|
|
+
|
|
+ if (fdb_info->local && dp->ds->assisted_learning_on_cpu_port)
|
|
+ dp = dp->cpu_dp;
|
|
+ else if (!fdb_info->added_by_user)
|
|
+ return NOTIFY_OK;
|
|
} else {
|
|
/* Snoop addresses learnt on foreign interfaces
|
|
* bridged with us, for switches that don't
|