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

Commit 5420683a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-simplify-switchdev-prepare-phase' 



Vivien Didelot says:

====================
net: dsa: simplify switchdev prepare phase

This patch series brings no functional changes.

It removes the unused switchdev_trans arguments from the dsa_switch_ops
for both MDB and VLAN operations, and provides functions to prepare and
add these objects for a given bitmap of ports.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 183dea58 e6db98db

drivers/net/dsa/b53/b53_common.c

+2 −4
Original line number Diff line number Diff line
@@ -1029,8 +1029,7 @@ int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering) 
EXPORT_SYMBOL(b53_vlan_filtering);



int b53_vlan_prepare(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan,

		     struct switchdev_trans *trans)

		     const struct switchdev_obj_port_vlan *vlan)

{

	struct b53_device *dev = ds->priv;
@@ -1047,8 +1046,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port, 
EXPORT_SYMBOL(b53_vlan_prepare);



void b53_vlan_add(struct dsa_switch *ds, int port,

		  const struct switchdev_obj_port_vlan *vlan,

		  struct switchdev_trans *trans)

		  const struct switchdev_obj_port_vlan *vlan)

{

	struct b53_device *dev = ds->priv;

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

drivers/net/dsa/b53/b53_priv.h

+2 −4
Original line number Diff line number Diff line
@@ -295,11 +295,9 @@ void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state); 
void b53_br_fast_age(struct dsa_switch *ds, int port);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);

int b53_vlan_prepare(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan,

		     struct switchdev_trans *trans);

		     const struct switchdev_obj_port_vlan *vlan);

void b53_vlan_add(struct dsa_switch *ds, int port,

		  const struct switchdev_obj_port_vlan *vlan,

		  struct switchdev_trans *trans);

		  const struct switchdev_obj_port_vlan *vlan);

int b53_vlan_del(struct dsa_switch *ds, int port,

		 const struct switchdev_obj_port_vlan *vlan);

int b53_fdb_add(struct dsa_switch *ds, int port,

drivers/net/dsa/dsa_loop.c

+4 −5
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port, 
	return 0;

}



static int dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port,

				      const struct switchdev_obj_port_vlan *vlan,

				      struct switchdev_trans *trans)

static int

dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port,

			   const struct switchdev_obj_port_vlan *vlan)

{

	struct dsa_loop_priv *ps = ds->priv;

	struct mii_bus *bus = ps->bus;
@@ -193,8 +193,7 @@ static int dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port, 
}



static void dsa_loop_port_vlan_add(struct dsa_switch *ds, int port,

				   const struct switchdev_obj_port_vlan *vlan,

				   struct switchdev_trans *trans)

				   const struct switchdev_obj_port_vlan *vlan)

{

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;

drivers/net/dsa/lan9303-core.c

+2 −4
Original line number Diff line number Diff line
@@ -1217,8 +1217,7 @@ static int lan9303_port_fdb_dump(struct dsa_switch *ds, int port, 
}



static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port,

				    const struct switchdev_obj_port_mdb *mdb,

				    struct switchdev_trans *trans)

				    const struct switchdev_obj_port_mdb *mdb)

{

	struct lan9303 *chip = ds->priv;
@@ -1235,8 +1234,7 @@ static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port, 
}



static void lan9303_port_mdb_add(struct dsa_switch *ds, int port,

				 const struct switchdev_obj_port_mdb *mdb,

				 struct switchdev_trans *trans)

				 const struct switchdev_obj_port_mdb *mdb)

{

	struct lan9303 *chip = ds->priv;

drivers/net/dsa/microchip/ksz_common.c

+4 −8
Original line number Diff line number Diff line
@@ -559,8 +559,7 @@ static int ksz_port_vlan_filtering(struct dsa_switch *ds, int port, bool flag) 
}



static int ksz_port_vlan_prepare(struct dsa_switch *ds, int port,

				 const struct switchdev_obj_port_vlan *vlan,

				 struct switchdev_trans *trans)

				 const struct switchdev_obj_port_vlan *vlan)

{

	/* nothing needed */
@@ -568,8 +567,7 @@ static int ksz_port_vlan_prepare(struct dsa_switch *ds, int port, 
}



static void ksz_port_vlan_add(struct dsa_switch *ds, int port,

			      const struct switchdev_obj_port_vlan *vlan,

			      struct switchdev_trans *trans)

			      const struct switchdev_obj_port_vlan *vlan)

{

	struct ksz_device *dev = ds->priv;

	u32 vlan_table[3];
@@ -858,16 +856,14 @@ static int ksz_port_fdb_dump(struct dsa_switch *ds, int port, 
}



static int ksz_port_mdb_prepare(struct dsa_switch *ds, int port,

				const struct switchdev_obj_port_mdb *mdb,

				struct switchdev_trans *trans)

				const struct switchdev_obj_port_mdb *mdb)

{

	/* nothing to do */

	return 0;

}



static void ksz_port_mdb_add(struct dsa_switch *ds, int port,

			     const struct switchdev_obj_port_mdb *mdb,

			     struct switchdev_trans *trans)

			     const struct switchdev_obj_port_mdb *mdb)

{

	struct ksz_device *dev = ds->priv;

	u32 static_table[4];