]> git.baikalelectronics.ru Git - kernel.git/commit
net: dsa: felix: remove redundant assignment in felix_8021q_cpu_port_deinit
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 3 Mar 2022 14:01:26 +0000 (16:01 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Mar 2022 09:21:23 +0000 (09:21 +0000)
commit7382aebdc084de5b5f13fe793d83fefd9697c369
tree4ef85402b29b49a24e51561a45e5706bef46eb02
parentf94c46d300279162802a004b7cc187c78a65df4a
net: dsa: felix: remove redundant assignment in felix_8021q_cpu_port_deinit

Due to an apparently incorrect conflict resolution on my part in commit
e5deb5a84952 ("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>
drivers/net/dsa/ocelot/felix.c