net: dsa: rename the host FDB and MDB methods to contain the "bridge" namespace

We are preparing to add API in port.c that adds FDB and MDB entries that
correspond to the port's standalone database. Rename the existing
methods to make it clear that the FDB and MDB entries offloaded come
from the bridge database.

Since the function names lengthen in dsa_slave_switchdev_event_work(),
we place "addr" and "vid" in temporary variables, to shorten those.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 07c0ad5..2e05c86 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -223,10 +223,10 @@ int dsa_port_fdb_add(struct dsa_port *dp, const unsigned char *addr,
                     u16 vid);
 int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,
                     u16 vid);
-int dsa_port_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,
-                         u16 vid);
-int dsa_port_host_fdb_del(struct dsa_port *dp, const unsigned char *addr,
-                         u16 vid);
+int dsa_port_bridge_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,
+                                u16 vid);
+int dsa_port_bridge_host_fdb_del(struct dsa_port *dp, const unsigned char *addr,
+                                u16 vid);
 int dsa_port_lag_fdb_add(struct dsa_port *dp, const unsigned char *addr,
                         u16 vid);
 int dsa_port_lag_fdb_del(struct dsa_port *dp, const unsigned char *addr,
@@ -236,10 +236,10 @@ int dsa_port_mdb_add(const struct dsa_port *dp,
                     const struct switchdev_obj_port_mdb *mdb);
 int dsa_port_mdb_del(const struct dsa_port *dp,
                     const struct switchdev_obj_port_mdb *mdb);
-int dsa_port_host_mdb_add(const struct dsa_port *dp,
-                         const struct switchdev_obj_port_mdb *mdb);
-int dsa_port_host_mdb_del(const struct dsa_port *dp,
-                         const struct switchdev_obj_port_mdb *mdb);
+int dsa_port_bridge_host_mdb_add(const struct dsa_port *dp,
+                                const struct switchdev_obj_port_mdb *mdb);
+int dsa_port_bridge_host_mdb_del(const struct dsa_port *dp,
+                                const struct switchdev_obj_port_mdb *mdb);
 int dsa_port_pre_bridge_flags(const struct dsa_port *dp,
                              struct switchdev_brport_flags flags,
                              struct netlink_ext_ack *extack);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index d9da425..4fb282a 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -835,8 +835,8 @@ int dsa_port_fdb_del(struct dsa_port *dp, const unsigned char *addr,
        return dsa_port_notify(dp, DSA_NOTIFIER_FDB_DEL, &info);
 }
 
-int dsa_port_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,
-                         u16 vid)
+int dsa_port_bridge_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,
+                                u16 vid)
 {
        struct dsa_notifier_fdb_info info = {
                .sw_index = dp->ds->index,
@@ -867,8 +867,8 @@ int dsa_port_host_fdb_add(struct dsa_port *dp, const unsigned char *addr,
        return dsa_port_notify(dp, DSA_NOTIFIER_HOST_FDB_ADD, &info);
 }
 
-int dsa_port_host_fdb_del(struct dsa_port *dp, const unsigned char *addr,
-                         u16 vid)
+int dsa_port_bridge_host_fdb_del(struct dsa_port *dp, const unsigned char *addr,
+                                u16 vid)
 {
        struct dsa_notifier_fdb_info info = {
                .sw_index = dp->ds->index,
@@ -982,8 +982,8 @@ int dsa_port_mdb_del(const struct dsa_port *dp,
        return dsa_port_notify(dp, DSA_NOTIFIER_MDB_DEL, &info);
 }
 
-int dsa_port_host_mdb_add(const struct dsa_port *dp,
-                         const struct switchdev_obj_port_mdb *mdb)
+int dsa_port_bridge_host_mdb_add(const struct dsa_port *dp,
+                                const struct switchdev_obj_port_mdb *mdb)
 {
        struct dsa_notifier_mdb_info info = {
                .sw_index = dp->ds->index,
@@ -1007,8 +1007,8 @@ int dsa_port_host_mdb_add(const struct dsa_port *dp,
        return dsa_port_notify(dp, DSA_NOTIFIER_HOST_MDB_ADD, &info);
 }
 
-int dsa_port_host_mdb_del(const struct dsa_port *dp,
-                         const struct switchdev_obj_port_mdb *mdb)
+int dsa_port_bridge_host_mdb_del(const struct dsa_port *dp,
+                                const struct switchdev_obj_port_mdb *mdb)
 {
        struct dsa_notifier_mdb_info info = {
                .sw_index = dp->ds->index,

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 52d1316..f0d8f2f 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -397,7 +397,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev, const void *ctx,
                if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
                        return -EOPNOTSUPP;
 
-               err = dsa_port_host_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
+               err = dsa_port_bridge_host_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
                break;
        case SWITCHDEV_OBJ_ID_PORT_VLAN:
                if (dsa_port_offloads_bridge_port(dp, obj->orig_dev))
@@ -478,7 +478,7 @@ static int dsa_slave_port_obj_del(struct net_device *dev, const void *ctx,
                if (!dsa_port_offloads_bridge_dev(dp, obj->orig_dev))
                        return -EOPNOTSUPP;
 
-               err = dsa_port_host_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
+               err = dsa_port_bridge_host_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));
                break;
        case SWITCHDEV_OBJ_ID_PORT_VLAN:
                if (dsa_port_offloads_bridge_port(dp, obj->orig_dev))
@@ -2356,7 +2356,9 @@ 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);
+       const unsigned char *addr = switchdev_work->addr;
        struct net_device *dev = switchdev_work->dev;
+       u16 vid = switchdev_work->vid;
        struct dsa_switch *ds;
        struct dsa_port *dp;
        int err;
@@ -2367,19 +2369,15 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)
        switch (switchdev_work->event) {
        case SWITCHDEV_FDB_ADD_TO_DEVICE:
                if (switchdev_work->host_addr)
-                       err = dsa_port_host_fdb_add(dp, switchdev_work->addr,
-                                                   switchdev_work->vid);
+                       err = dsa_port_bridge_host_fdb_add(dp, addr, vid);
                else if (dp->lag)
-                       err = dsa_port_lag_fdb_add(dp, switchdev_work->addr,
-                                                  switchdev_work->vid);
+                       err = dsa_port_lag_fdb_add(dp, addr, vid);
                else
-                       err = dsa_port_fdb_add(dp, switchdev_work->addr,
-                                              switchdev_work->vid);
+                       err = dsa_port_fdb_add(dp, addr, vid);
                if (err) {
                        dev_err(ds->dev,
                                "port %d failed to add %pM vid %d to fdb: %d\n",
-                               dp->index, switchdev_work->addr,
-                               switchdev_work->vid, err);
+                               dp->index, addr, vid, err);
                        break;
                }
                dsa_fdb_offload_notify(switchdev_work);
@@ -2387,19 +2385,15 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work)
 
        case SWITCHDEV_FDB_DEL_TO_DEVICE:
                if (switchdev_work->host_addr)
-                       err = dsa_port_host_fdb_del(dp, switchdev_work->addr,
-                                                   switchdev_work->vid);
+                       err = dsa_port_bridge_host_fdb_del(dp, addr, vid);
                else if (dp->lag)
-                       err = dsa_port_lag_fdb_del(dp, switchdev_work->addr,
-                                                  switchdev_work->vid);
+                       err = dsa_port_lag_fdb_del(dp, addr, vid);
                else
-                       err = dsa_port_fdb_del(dp, switchdev_work->addr,
-                                              switchdev_work->vid);
+                       err = dsa_port_fdb_del(dp, addr, vid);
                if (err) {
                        dev_err(ds->dev,
                                "port %d failed to delete %pM vid %d from fdb: %d\n",
-                               dp->index, switchdev_work->addr,
-                               switchdev_work->vid, err);
+                               dp->index, addr, vid, err);
                }
 
                break;