Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ba57cf authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

switchdev: rename switchdev_obj_fdb to switchdev_obj_port_fdb 



Make the struct name in sync with object id name.

Suggested-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarScott Feldman <sfeldma@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f24f309

drivers/net/ethernet/rocker/rocker.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

include/net/switchdev.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/bridge/br_fdb.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

	};

net/dsa/slave.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

net/switchdev/switchdev.c

+4 −4
Original line number Diff line number Diff line
@@ -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;