drivers/net/team/team_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
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>
---
Related discussion:
https://lore.kernel.org/netdev/admyw5vnd3hup26xew7yxfwqo4ypr5sfb3esk7spv4jx3yqpxu@g47iffagagah/
drivers/net/team/team_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
index 0a41d2b45d8c..4d5c9ae8f221 100644
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c
@@ -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);
--
2.51.0
Fri, Nov 28, 2025 at 08:25:44AM +0100, zlatistiv@gmail.com wrote: >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: Jiri Pirko <jiri@nvidia.com>
On Fri, Nov 28, 2025 at 09:25:44AM +0200, Nikola Z. Ivanov wrote: > 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> > --- > Related discussion: > https://lore.kernel.org/netdev/admyw5vnd3hup26xew7yxfwqo4ypr5sfb3esk7spv4jx3yqpxu@g47iffagagah/ Reviewed-by: Simon Horman <horms@kernel.org>
© 2016 - 2025 Red Hat, Inc.