OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-10-26 11:22:59 -04:00 committed by David S. Miller
parent c38c5a6650
commit 5749f0f377
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/dsa.h
View File

@ -240,9 +240,6 @@ struct dsa_switch {
/* /*
* Slave mii_bus and devices for the individual ports. * 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; u32 phys_mii_mask;
struct mii_bus *slave_mii_bus; struct mii_bus *slave_mii_bus;

11
net/dsa/dsa2.c
View File

@ -184,7 +184,6 @@ static int dsa_ds_complete(struct dsa_switch_tree *dst, struct dsa_switch *ds)
if (err != 0) if (err != 0)
return err; return err;
ds->dsa_port_mask |= BIT(index);
port->type = DSA_PORT_TYPE_DSA; 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; 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; port->type = DSA_PORT_TYPE_CPU;
tag_protocol = ds->ops->get_tag_protocol(ds); 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) if (err)
return err; return err;
} else { } 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; port->type = DSA_PORT_TYPE_USER;
} }

3
net/dsa/legacy.c
View File

@ -124,13 +124,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds,
} }
dst->cpu_dp = &ds->ports[i]; dst->cpu_dp = &ds->ports[i];
dst->cpu_dp->master = master; dst->cpu_dp->master = master;
ds->cpu_port_mask |= 1 << i;
dp->type = DSA_PORT_TYPE_CPU; dp->type = DSA_PORT_TYPE_CPU;
} else if (!strcmp(name, "dsa")) { } else if (!strcmp(name, "dsa")) {
ds->dsa_port_mask |= 1 << i;
dp->type = DSA_PORT_TYPE_DSA; dp->type = DSA_PORT_TYPE_DSA;
} else { } else {
ds->enabled_port_mask |= 1 << i;
dp->type = DSA_PORT_TYPE_USER; dp->type = DSA_PORT_TYPE_USER;
} }
valid_name_found = true; valid_name_found = true;