Revert: teamd: lacp: make sure that lacp_port_agg_update() works with correct unselectable state
Actually, the patch was wrong, revert it.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c
index a76c372..3b4f7b1 100644
--- a/teamd/teamd_runner_lacp.c
+++ b/teamd/teamd_runner_lacp.c
@@ -747,8 +747,7 @@
lacp_get_agg_lead(lacp_port) != lacp_port;
}
-static int lacp_port_set_state_agg_update(struct lacp_port *lacp_port,
- enum lacp_port_state new_state)
+static int lacp_port_agg_update(struct lacp_port *lacp_port)
{
if (lacp_port_selected(lacp_port) &&
(lacp_port_unselectable_state(lacp_port) ||
@@ -757,8 +756,6 @@
lacp_port_mergeable(lacp_port)))
lacp_port_agg_unselect(lacp_port);
- lacp_port->state = new_state;
-
if (!lacp_port_selected(lacp_port) &&
(lacp_port_selectable_state(lacp_port) &&
lacp_port_loopback_free(lacp_port)))
@@ -767,11 +764,6 @@
return lacp_selected_agg_update(lacp_port->lacp, NULL);
}
-static int lacp_port_agg_update(struct lacp_port *lacp_port)
-{
- return lacp_port_set_state_agg_update(lacp_port, lacp_port->state);
-}
-
static const char slow_addr[ETH_ALEN] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x02 };
static int __slow_addr_add_del(struct lacp_port *lacp_port, bool add)
@@ -1008,8 +1000,9 @@
lacp_port->tdport->ifname,
lacp_port_state_name[lacp_port->state],
lacp_port_state_name[new_state]);
+ lacp_port->state = new_state;
- err = lacp_port_set_state_agg_update(lacp_port, new_state);
+ err = lacp_port_agg_update(lacp_port);
if (err)
return err;
