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

Commit 5749f0f3 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: remove port masks 



Now that DSA core provides port types, there is no need to keep this
information at the switch level. This is a static information that is
part of a DSA core dsa_port structure. Remove them.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c38c5a66

include/net/dsa.h

+0 −3
Original line number Diff line number Diff line
@@ -240,9 +240,6 @@ struct dsa_switch { 
	/*

	 * Slave mii_bus and devices for the individual ports.

	 */

	u32			dsa_port_mask;

	u32			cpu_port_mask;

	u32			enabled_port_mask;

	u32			phys_mii_mask;

	struct mii_bus		*slave_mii_bus;

net/dsa/dsa2.c

+0 −11
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ static int dsa_ds_complete(struct dsa_switch_tree *dst, struct dsa_switch *ds) 
		if (err != 0)

			return err;



		ds->dsa_port_mask |= BIT(index);

		port->type = DSA_PORT_TYPE_DSA;

	}
@@ -500,11 +499,6 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, 
		dst->cpu_dp->master = ethernet_dev;

	}



	/* Initialize cpu_port_mask now for drv->setup()

	 * to have access to a correct value, just like what

	 * net/dsa/dsa.c::dsa_switch_setup_one does.

	 */

	ds->cpu_port_mask |= BIT(index);

	port->type = DSA_PORT_TYPE_CPU;



	tag_protocol = ds->ops->get_tag_protocol(ds);
@@ -540,11 +534,6 @@ static int dsa_ds_parse(struct dsa_switch_tree *dst, struct dsa_switch *ds) 
			if (err)

				return err;

		} else {

			/* Initialize enabled_port_mask now for drv->setup()

			 * to have access to a correct value, just like what

			 * net/dsa/dsa.c::dsa_switch_setup_one does.

			 */

			ds->enabled_port_mask |= BIT(index);

			port->type = DSA_PORT_TYPE_USER;

		}

net/dsa/legacy.c

+0 −3
Original line number Diff line number Diff line
@@ -124,13 +124,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
			}

			dst->cpu_dp = &ds->ports[i];

			dst->cpu_dp->master = master;

			ds->cpu_port_mask |= 1 << i;

			dp->type = DSA_PORT_TYPE_CPU;

		} else if (!strcmp(name, "dsa")) {

			ds->dsa_port_mask |= 1 << i;

			dp->type = DSA_PORT_TYPE_DSA;

		} else {

			ds->enabled_port_mask |= 1 << i;

			dp->type = DSA_PORT_TYPE_USER;

		}

		valid_name_found = true;