diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-03-03 15:01:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-04 10:21:23 +0100 |
| commit | 28c1305b0b721166912189afd6238c1613bb7891 (patch) | |
| tree | 5e8f0f19e00f18d1f63f58d8edcd72f390ee06d5 /drivers/net/dsa/ocelot | |
| parent | net: mscc: ocelot: use pretty names for IPPROTO_UDP and IPPROTO_TCP (diff) | |
| download | linux-28c1305b0b721166912189afd6238c1613bb7891.tar.xz linux-28c1305b0b721166912189afd6238c1613bb7891.zip | |
net: dsa: felix: remove ocelot->npi assignment from felix_8021q_cpu_port_init
This assignment is redundant, since ocelot->npi has already been set to
-1 by felix_npi_port_deinit(). Call path:
felix_change_tag_protocol
-> felix_del_tag_protocol(DSA_TAG_PROTO_OCELOT)
-> felix_teardown_tag_npi
-> felix_npi_port_deinit
-> felix_set_tag_protocol(DSA_TAG_PROTO_OCELOT_8021Q)
-> felix_setup_tag_8021q
-> felix_8021q_cpu_port_init
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/ocelot')
| -rw-r--r-- | drivers/net/dsa/ocelot/felix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 638f420bf599..7db1169a418b 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -370,7 +370,6 @@ static void felix_8021q_cpu_port_init(struct ocelot *ocelot, int port) mutex_lock(&ocelot->fwd_domain_lock); ocelot_port_set_dsa_8021q_cpu(ocelot, port); - ocelot->npi = -1; /* Overwrite PGID_CPU with the non-tagging port */ ocelot_write_rix(ocelot, BIT(port), ANA_PGID_PGID, PGID_CPU); |