]> Gentwo Git Trees - linux/.git/commitdiff
team: Add matching error label for failed action
authorNikola Z. Ivanov <zlatistiv@gmail.com>
Fri, 28 Nov 2025 07:25:44 +0000 (09:25 +0200)
committerJakub Kicinski <kuba@kernel.org>
Mon, 1 Dec 2025 22:20:17 +0000 (14:20 -0800)
Follow the "action" - "err_action" pairing of labels
found across the source code of team net device.

Currently in team_port_add the err_set_slave_promisc
label is reused for exiting on error when setting
allmulti level of the new slave.

Signed-off-by: Nikola Z. Ivanov <zlatistiv@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://patch.msgid.link/20251128072544.223645-1-zlatistiv@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/team/team_core.c

index 0a41d2b45d8c8c9aa40ab1e551208813b906bc4c..4d5c9ae8f221905a3ca29b88a3b03abe8d622634 100644 (file)
@@ -1231,7 +1231,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
                if (err) {
                        if (dev->flags & IFF_PROMISC)
                                dev_set_promiscuity(port_dev, -1);
-                       goto err_set_slave_promisc;
+                       goto err_set_slave_allmulti;
                }
        }
 
@@ -1258,6 +1258,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
        return 0;
 
 err_set_dev_type:
+err_set_slave_allmulti:
 err_set_slave_promisc:
        __team_option_inst_del_port(team, port);