From: Vladimir Oltean Date: Thu, 3 Mar 2022 14:01:26 +0000 (+0200) Subject: net: dsa: felix: remove redundant assignment in felix_8021q_cpu_port_deinit X-Git-Tag: v5.18-rc1~136^2~194^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=162fbf6a2f958673cabaa844b5dc0e0b301a757a;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 1e93126a913ad..7cc67097948bd 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 */