Skip to content

Commit aee0f01

Browse files
zlatistivkuba-moo
authored andcommitted
team: Add matching error label for failed action
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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 9bf6603 commit aee0f01

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/team/team_core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
12311231
if (err) {
12321232
if (dev->flags & IFF_PROMISC)
12331233
dev_set_promiscuity(port_dev, -1);
1234-
goto err_set_slave_promisc;
1234+
goto err_set_slave_allmulti;
12351235
}
12361236
}
12371237

@@ -1258,6 +1258,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
12581258
return 0;
12591259

12601260
err_set_dev_type:
1261+
err_set_slave_allmulti:
12611262
err_set_slave_promisc:
12621263
__team_option_inst_del_port(team, port);
12631264

0 commit comments

Comments
 (0)