target/linux/generic/pending-5.10/765-net-dsa-Include-local-addresses-in-assisted-CPU-port.patch

   1 From dd082716b43a3684b2f473ae5d1e76d1c076d86d Mon Sep 17 00:00:00 2001
   2 From: Tobias Waldekranz <tobias@waldekranz.com>
   3 Date: Sat, 16 Jan 2021 02:25:12 +0100
   4 Subject: [PATCH] net: dsa: Include local addresses in assisted CPU port
   5  learning
   6
   7 Add local addresses (i.e. the ports' MAC addresses) to the hardware
   8 FDB when assisted CPU port learning is enabled.
   9
  10 NOTE: The bridge's own MAC address is also "local". If that address is
  11 not shared with any port, the bridge's MAC is not be added by this
  12 functionality - but the following commit takes care of that case.
  13
  14 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
  15 ---
  16  net/dsa/slave.c | 8 +++++---
  17  1 file changed, 5 insertions(+), 3 deletions(-)
  18
  19 --- a/net/dsa/slave.c
  20 +++ b/net/dsa/slave.c
  21 @@ -2144,10 +2144,12 @@ static int dsa_slave_switchdev_event(str
  22                 fdb_info = ptr;
  23
  24                 if (dsa_slave_dev_check(dev)) {
  25 -                       if (!fdb_info->added_by_user)
  26 -                               return NOTIFY_OK;
  27 -
  28                         dp = dsa_slave_to_port(dev);
  29 +
  30 +                       if (fdb_info->local && dp->ds->assisted_learning_on_cpu_port)
  31 +                               dp = dp->cpu_dp;
  32 +                       else if (!fdb_info->added_by_user)
  33 +                               return NOTIFY_OK;
  34                 } else {
  35                         /* Snoop addresses learnt on foreign interfaces
  36                          * bridged with us, for switches that don't