[PATCH v2 7/9] station: use netdev_ft_reassociate

James Prestwood
2023-12-06T15:07:23Z

Using this will provide netdev with a connect callback and unify the
roaming result notification between FT and reassociation. Both paths
will now end up in station_reassociate_cb.

Fixes: 30c6a10f28 ("netdev: Separate connect_failed and disconnected paths")
---
src/station.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/station.c b/src/station.c
index 48a595dc..b5e78a37 100644
--- a/src/station.c
+++ b/src/station.c
@@ -2181,7 +2181,8 @@ static void station_reassociate_cb(struct netdev *netdev,

l_debug("%u, result: %d", netdev_get_ifindex(station->netdev), result);

- if (station->state != STATION_STATE_ROAMING)
+ if (station->state != STATION_STATE_ROAMING &&
+ station->state != STATION_STATE_FT_ROAMING)
return;

if (result == NETDEV_RESULT_OK)
@@ -2314,7 +2315,8 @@ static bool station_ft_work_ready(struct wiphy_radio_work_item *item)
if (!bss)
goto try_next;

- ret = ft_associate(netdev_get_ifindex(station->netdev), bss->addr);
+ ret = ft_handshake_setup(netdev_get_ifindex(station->netdev),
+ bss->addr);
switch (ret) {
case MMPDU_STATUS_CODE_INVALID_PMKID:
/*
@@ -2343,6 +2345,13 @@ try_next:
station_transition_start(station);
break;
case 0:
+ ret = netdev_ft_reassociate(station->netdev, bss,
+ station->connected_bss,
+ station_netdev_event,
+ station_reassociate_cb, station);
+ if (ret < 0)
+ goto roam_failed;
+
station->connected_bss = bss;
station->preparing_roam = false;
station_enter_state(station, STATION_STATE_FT_ROAMING);
@@ -2354,6 +2363,7 @@ try_next:
if (ret > 0)
goto try_next;

+roam_failed:
station_roam_failed(station);
break;
}
--
2.34.1