diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-03-03 16:01:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-04 09:21:23 +0000 |
| commit | 162fbf6a2f958673cabaa844b5dc0e0b301a757a (patch) | |
| tree | 4ef85402b29b49a24e51561a45e5706bef46eb02 | |
| parent | 5d3bb7dda43ad22a0caa78b0222beab0462a669e (diff) | |
| download | linux-162fbf6a2f958673cabaa844b5dc0e0b301a757a.tar.gz | |
net: dsa: felix: remove redundant assignment in felix_8021q_cpu_port_deinit
Due to an apparently incorrect conflict resolution on my part in commit
54c319846086 ("net: mscc: ocelot: enforce FDB isolation when
VLAN-unaware"), "ocelot->ports[port]->is_dsa_8021q_cpu = false" was
supposed to be replaced by "ocelot_port_unset_dsa_8021q_cpu(ocelot, port)"
which does the same thing, and more. But now we have both, so the direct
assignment is redundant. Remove it.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 1e93126a913a..7cc67097948b 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -383,7 +383,6 @@ static void felix_8021q_cpu_port_deinit(struct ocelot *ocelot, int port) { mutex_lock(&ocelot->fwd_domain_lock); - ocelot->ports[port]->is_dsa_8021q_cpu = false; ocelot_port_unset_dsa_8021q_cpu(ocelot, port); /* Restore PGID_CPU */ |