Commit 162fbf6a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: felix: remove redundant assignment in felix_8021q_cpu_port_deinit 



Due to an apparently incorrect conflict resolution on my part in commit
54c31984 ("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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d3bb7dd

drivers/net/dsa/ocelot/felix.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */