Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

station: use netdev_ft_reassociate

Browse Source 
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.

This also adds another return case for ft_handshake_setup which was
previously ignored by ft_associate. Its likely impossible to actually
happen but should be handled nevertheless.

Fixes: 30c6a10f28 ("netdev: Separate connect_failed and disconnected paths")
This commit is contained in:
James Prestwood 2023-12-06 12:18:00 -08:00 committed by Denis Kenzior
parent 7b0cda76a9
commit 56dac6744b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.c
View File

@ -2181,7 +2181,8 @@ static void station_reassociate_cb(struct netdev *netdev,
l_debug("%u, result: %d", netdev_get_ifindex(station->netdev), result); 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; return;
if (result == NETDEV_RESULT_OK) if (result == NETDEV_RESULT_OK)
@ -2314,7 +2315,8 @@ static bool station_ft_work_ready(struct wiphy_radio_work_item *item)
if (!bss) if (!bss)
goto try_next; 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) { switch (ret) {
case MMPDU_STATUS_CODE_INVALID_PMKID: case MMPDU_STATUS_CODE_INVALID_PMKID:
/* /*
@ -2343,12 +2345,28 @@ try_next:
station_transition_start(station); station_transition_start(station);
break; break;
case 0: case 0:
ret = netdev_ft_reassociate(station->netdev, bss,
station->connected_bss,
station_netdev_event,
station_reassociate_cb, station);
if (ret < 0)
goto disassociate;
station->connected_bss = bss; station->connected_bss = bss;
station->preparing_roam = false; station->preparing_roam = false;
station_enter_state(station, STATION_STATE_FT_ROAMING); station_enter_state(station, STATION_STATE_FT_ROAMING);
station_debug_event(station, "ft-roam"); station_debug_event(station, "ft-roam");
break;
case -EINVAL:
/*
* Likely an impossible situation, but since ft_handshake_setup
* rederived the handshake keys we can't do anything but
* disconnect.
*/
disassociate:
station_disassociated(station);
break; break;
default: default:
if (ret > 0) if (ret > 0)