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

Commit 240ea3ef authored Mar 30, 2017 by Vivien Didelot Committed by David S. Miller Apr 01, 2017

net: dsa: mv88e6xxx: factorize in-chip bridge map



Factorize the code in the DSA port_bridge_{join,leave} routines used to
program the port VLAN map of all local ports of a given bridge group.

At the same time shorten the _mv88e6xxx_port_based_vlan_map to get rid
of the old underscore prefix naming convention.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e5887a2a

drivers/net/dsa/mv88e6xxx/chip.c

+25 −22

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,7 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port)
		return pvlan;
		}

		static int _mv88e6xxx_port_based_vlan_map(struct mv88e6xxx_chip *chip, int port)
		static int mv88e6xxx_port_vlan_map(struct mv88e6xxx_chip *chip, int port)
		{
		u16 output_ports = mv88e6xxx_port_vlan(chip, chip->ds->index, port);

		@@ -2140,23 +2140,32 @@ static int mv88e6xxx_port_fdb_dump(struct dsa_switch *ds, int port,
		return err;
		}

		static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
		static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip,
		struct net_device *br)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int i, err = 0;

		mutex_lock(&chip->reg_lock);
		int port;
		int err;

		/* Remap each port's VLANTable */
		for (i = 0; i < mv88e6xxx_num_ports(chip); ++i) {
		if (ds->ports[i].bridge_dev == br) {
		err = _mv88e6xxx_port_based_vlan_map(chip, i);
		/* Remap the Port VLAN of each local bridge group member */
		for (port = 0; port < mv88e6xxx_num_ports(chip); ++port) {
		if (chip->ds->ports[port].bridge_dev == br) {
		err = mv88e6xxx_port_vlan_map(chip, port);
		if (err)
		break;
		return err;
		}
		}

		return 0;
		}

		static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
		struct net_device *br)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int err;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_bridge_map(chip, br);
		mutex_unlock(&chip->reg_lock);

		return err;
		@@ -2166,17 +2175,11 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,
		struct net_device *br)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int i;

		mutex_lock(&chip->reg_lock);

		/* Remap each port's VLANTable */
		for (i = 0; i < mv88e6xxx_num_ports(chip); ++i)
		if (i == port \|\| ds->ports[i].bridge_dev == br)
		if (_mv88e6xxx_port_based_vlan_map(chip, i))
		netdev_warn(ds->ports[i].netdev,
		"failed to remap\n");

		if (mv88e6xxx_bridge_map(chip, br) \|\|
		mv88e6xxx_port_vlan_map(chip, port))
		dev_err(ds->dev, "failed to remap in-chip Port VLAN\n");
		mutex_unlock(&chip->reg_lock);
		}

		@@ -2490,7 +2493,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
		if (err)
		return err;

		err = _mv88e6xxx_port_based_vlan_map(chip, port);
		err = mv88e6xxx_port_vlan_map(chip, port);
		if (err)
		return err;