OSDN Git Service

net: dsa: make dsa_tree_change_tag_proto actually unwind the tag proto change
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 3 Mar 2022 15:42:49 +0000 (17:42 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Mar 2022 16:39:12 +0000 (08:39 -0800)
commite1bec7fa1cee311a6d3fb9161037c7675904134d
treef49f30d6e5be6f5851e16d0bd4a2d2c2bc03a097
parent6c7273a266759d9d36f7c862149f248bcdeddc0f
net: dsa: make dsa_tree_change_tag_proto actually unwind the tag proto change

The blamed commit said one thing but did another. It explains that we
should restore the "return err" to the original "goto out_unwind_tagger",
but instead it replaced it with "goto out_unlock".

When DSA_NOTIFIER_TAG_PROTO fails after the first switch of a
multi-switch tree, the switches would end up not using the same tagging
protocol.

Fixes: 0b0e2ff10356 ("net: dsa: restore error path of dsa_tree_change_tag_proto")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20220303154249.1854436-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dsa/dsa2.c