net: dsa: call SWITCHDEV_FDB_OFFLOADED for the orig_dev

When switchdev_handle_fdb_event_to_device() replicates a FDB event
emitted for the bridge or for a LAG port and DSA offloads that, we
should notify back to switchdev that the FDB entry on the original
device is what was offloaded, not on the DSA slave devices that the
event is replicated on.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index f35b7a1..f2364c5 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -120,6 +120,7 @@ struct dsa_notifier_master_state_info {
 
 struct dsa_switchdev_event_work {
        struct net_device *dev;
+       struct net_device *orig_dev;
        struct work_struct work;
        unsigned long event;
        /* Specific for SWITCHDEV_FDB_ADD_TO_DEVICE and

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 7eb9726..4aeb3e0 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2378,7 +2378,7 @@ dsa_fdb_offload_notify(struct dsa_switchdev_event_work *switchdev_work)
        info.vid = switchdev_work->vid;
        info.offloaded = true;
        call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,
-                                switchdev_work->dev, &info.info, NULL);
+                                switchdev_work->orig_dev, &info.info, NULL);
 }
 
 static void dsa_slave_switchdev_event_work(struct work_struct *work)
@@ -2495,6 +2495,7 @@ static int dsa_slave_fdb_event(struct net_device *dev,
        INIT_WORK(&switchdev_work->work, dsa_slave_switchdev_event_work);
        switchdev_work->event = event;
        switchdev_work->dev = dev;
+       switchdev_work->orig_dev = orig_dev;
 
        ether_addr_copy(switchdev_work->addr, fdb_info->addr);
        switchdev_work->vid = fdb_info->vid;