switchdev: rename switchdev_obj_fdb to switchdev_obj_port_fdb

Make the struct name in sync with object id name.

Suggested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index d75fc4b3baa907a947dbcea2f254ca644f3fd5f8..875f9b5b78a2b57ea376ad8a60f1c4a58386f4db 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4425,7 +4425,7 @@ static int rocker_port_vlans_add(struct rocker_port *rocker_port,
 
 static int rocker_port_fdb_add(struct rocker_port *rocker_port,
                               struct switchdev_trans *trans,
-                              const struct switchdev_obj_fdb *fdb)
+                              const struct switchdev_obj_port_fdb *fdb)
 {
        __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL);
        int flags = 0;
@@ -4496,7 +4496,7 @@ static int rocker_port_vlans_del(struct rocker_port *rocker_port,
 
 static int rocker_port_fdb_del(struct rocker_port *rocker_port,
                               struct switchdev_trans *trans,
-                              const struct switchdev_obj_fdb *fdb)
+                              const struct switchdev_obj_port_fdb *fdb)
 {
        __be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL);
        int flags = ROCKER_OP_FLAG_NOWAIT | ROCKER_OP_FLAG_REMOVE;
@@ -4537,7 +4537,7 @@ static int rocker_port_obj_del(struct net_device *dev,
 }
 
 static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
-                               struct switchdev_obj_fdb *fdb,
+                               struct switchdev_obj_port_fdb *fdb,
                                int (*cb)(void *obj))
 {
        struct rocker *rocker = rocker_port->rocker;

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 0138f9b374e2a7df1e659ab94ed7b07cc3ef7820..8d71fdbaa7a6d619a915dec659e8734b8beaae32 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -83,7 +83,7 @@ struct switchdev_obj_ipv4_fib {
 };
 
 /* SWITCHDEV_OBJ_ID_PORT_FDB */
-struct switchdev_obj_fdb {
+struct switchdev_obj_port_fdb {
        const unsigned char *addr;
        u16 vid;
        u16 ndm_state;

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6fc8e71277d44bfdfc8ad4c2be2dade60c320aed..36aab5e4784c6b6a5999491ea0f95775c9243f7a 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -133,7 +133,7 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
 
 static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
 {
-       struct switchdev_obj_fdb fdb = {
+       struct switchdev_obj_port_fdb fdb = {
                .addr = f->addr.addr,
                .vid = f->vlan_id,
        };

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index baf34f2221153aaa21b741d6d380368442b84df0..6e8dc6a0102c48cec03afdec0e8f707a6d18b43c 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -341,7 +341,7 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev,
 }
 
 static int dsa_slave_port_fdb_add(struct net_device *dev,
-                                 const struct switchdev_obj_fdb *fdb,
+                                 const struct switchdev_obj_port_fdb *fdb,
                                  struct switchdev_trans *trans)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
@@ -357,7 +357,7 @@ static int dsa_slave_port_fdb_add(struct net_device *dev,
 }
 
 static int dsa_slave_port_fdb_del(struct net_device *dev,
-                                 const struct switchdev_obj_fdb *fdb)
+                                 const struct switchdev_obj_port_fdb *fdb)
 {
        struct dsa_slave_priv *p = netdev_priv(dev);
        struct dsa_switch *ds = p->parent;
@@ -370,7 +370,7 @@ static int dsa_slave_port_fdb_del(struct net_device *dev,
 }
 
 static int dsa_slave_port_fdb_dump(struct net_device *dev,
-                                  struct switchdev_obj_fdb *fdb,
+                                  struct switchdev_obj_port_fdb *fdb,
                                   int (*cb)(void *obj))
 {
        struct dsa_slave_priv *p = netdev_priv(dev);

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 02ee926ebde6397293a42fc95f1ec344d09fd829..250d013d64c6dcc3b1317516f5d9d2dd290b9393 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -819,7 +819,7 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                           struct net_device *dev, const unsigned char *addr,
                           u16 vid, u16 nlm_flags)
 {
-       struct switchdev_obj_fdb fdb = {
+       struct switchdev_obj_port_fdb fdb = {
                .addr = addr,
                .vid = vid,
        };
@@ -843,7 +843,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
                           struct net_device *dev, const unsigned char *addr,
                           u16 vid)
 {
-       struct switchdev_obj_fdb fdb = {
+       struct switchdev_obj_port_fdb fdb = {
                .addr = addr,
                .vid = vid,
        };
@@ -853,7 +853,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
 EXPORT_SYMBOL_GPL(switchdev_port_fdb_del);
 
 struct switchdev_fdb_dump {
-       struct switchdev_obj_fdb fdb;
+       struct switchdev_obj_port_fdb fdb;
        struct net_device *dev;
        struct sk_buff *skb;
        struct netlink_callback *cb;
@@ -862,7 +862,7 @@ struct switchdev_fdb_dump {
 
 static int switchdev_port_fdb_dump_cb(void *obj)
 {
-       struct switchdev_obj_fdb *fdb = obj;
+       struct switchdev_obj_port_fdb *fdb = obj;
        struct switchdev_fdb_dump *dump =
                container_of(fdb, struct switchdev_fdb_dump, fdb);
        u32 portid = NETLINK_CB(dump->cb->skb).portid;