diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-03-03 16:42:49 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-03 17:39:12 +0100 |
| commit | e1bec7fa1cee311a6d3fb9161037c7675904134d (patch) | |
| tree | f49f30d6e5be6f5851e16d0bd4a2d2c2bc03a097 | |
| parent | ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc() (diff) | |
| download | linux-e1bec7fa1cee311a6d3fb9161037c7675904134d.tar.xz linux-e1bec7fa1cee311a6d3fb9161037c7675904134d.zip | |
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>
| -rw-r--r-- | net/dsa/dsa2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 209496996cdf..b4e67758e104 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -1261,7 +1261,7 @@ int dsa_tree_change_tag_proto(struct dsa_switch_tree *dst, info.tag_ops = tag_ops; err = dsa_tree_notify(dst, DSA_NOTIFIER_TAG_PROTO, &info); if (err) - goto out_unlock; + goto out_unwind_tagger; err = dsa_tree_bind_tag_proto(dst, tag_ops); if (err) |