net: dsa: remove "ds" and "port" from struct dsa_switchdev_event_work

By construction, the struct net_device *dev passed to
dsa_slave_switchdev_event_work() via struct dsa_switchdev_event_work
is always a DSA slave device.

Therefore, it is redundant to pass struct dsa_switch and int port
information in the deferred work structure. This can be retrieved at all
times from the provided struct net_device via dsa_slave_to_port().

For the same reason, we can drop the dsa_is_user_port() check in
dsa_fdb_offload_notify().

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 8612ff8..f35b7a1 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -119,8 +119,6 @@ struct dsa_notifier_master_state_info {
 };
 
 struct dsa_switchdev_event_work {
-       struct dsa_switch *ds;
-       int port;
        struct net_device *dev;
        struct work_struct work;
        unsigned long event;

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 4ea6e0f..7eb9726 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -2373,29 +2373,25 @@ static void
 dsa_fdb_offload_notify(struct dsa_switchdev_event_work *switchdev_work)
 {
        struct switchdev_notifier_fdb_info info = {};
-       struct dsa_switch *ds = switchdev_work->ds;
-       struct dsa_port *dp;
-
-       if (!dsa_is_user_port(ds, switchdev_work->port))
-               return;
 
        info.addr = switchdev_work->addr;
        info.vid = switchdev_work->vid;
        info.offloaded = true;
-       dp = dsa_to_port(ds, switchdev_work->port);
        call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,
-                                dp->slave, &info.info, NULL);
+                                switchdev_work->dev, &info.info, NULL);
 }
 
 static void dsa_slave_switchdev_event_work(struct work_struct *work)
 {
        struct dsa_switchdev_event_work *switchdev_work =
                container_of(work, struct dsa_switchdev_event_work, work);
-       struct dsa_switch *ds = switchdev_work->ds;
+       struct net_device *dev = switchdev_work->dev;
+       struct dsa_switch *ds;
        struct dsa_port *dp;
        int err;
 
-       dp = dsa_to_port(ds, switchdev_work->port);
+       dp = dsa_slave_to_port(dev);
+       ds = dp->ds;
 
        switch (switchdev_work->event) {
        case SWITCHDEV_FDB_ADD_TO_DEVICE:
@@ -2497,8 +2493,6 @@ static int dsa_slave_fdb_event(struct net_device *dev,
                   host_addr ? " as host address" : "");
 
        INIT_WORK(&switchdev_work->work, dsa_slave_switchdev_event_work);
-       switchdev_work->ds = ds;
-       switchdev_work->port = dp->index;
        switchdev_work->event = event;
        switchdev_work->dev = dev;