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

netdev: add NETDEV_EVENT_ECC_GROUP_RETRY, handle in station

Browse Source 
In order to complete the learned default group behavior station needs
to be aware of when an SAE/OWE connection retried. This is all
handled within netdev/sae so add a new netdev event so station can
set the appropriate network flags to prevent trying the non-default
group again.
This commit is contained in:
James Prestwood 2024-02-27 10:34:00 -08:00 committed by Denis Kenzior
parent a559bd7c40
commit fba4ee90d0
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/netdev.c
View File

@ -2559,6 +2559,10 @@ static bool netdev_retry_owe(struct netdev *netdev)
if (!owe_next_group(netdev->owe_sm)) if (!owe_next_group(netdev->owe_sm))
return false; return false;
if (netdev->event_filter)
netdev->event_filter(netdev, NETDEV_EVENT_ECC_GROUP_RETRY,
NULL, netdev->user_data);
connect_cmd = netdev_build_cmd_connect(netdev, netdev->handshake, NULL); connect_cmd = netdev_build_cmd_connect(netdev, netdev->handshake, NULL);
netdev->connect_cmd_id = l_genl_family_send(nl80211, connect_cmd, netdev->connect_cmd_id = l_genl_family_send(nl80211, connect_cmd,
@ -2966,6 +2970,17 @@ static void netdev_authenticate_event(struct l_genl_msg *msg,
ret = auth_proto_rx_authenticate(netdev->ap, frame, frame_len); ret = auth_proto_rx_authenticate(netdev->ap, frame, frame_len);
/*
* Allows station to persist settings so it does not retry
* the higher order ECC group again
*/
if (status_code ==
MMPDU_STATUS_CODE_UNSUPP_FINITE_CYCLIC_GROUP &&
netdev->event_filter)
netdev->event_filter(netdev,
NETDEV_EVENT_ECC_GROUP_RETRY,
NULL, netdev->user_data);
/* We have sent another CMD_AUTHENTICATE / CMD_ASSOCIATE */ /* We have sent another CMD_AUTHENTICATE / CMD_ASSOCIATE */
if (ret == 0 || ret == -EAGAIN) if (ret == 0 || ret == -EAGAIN)
return; return;

1
src/netdev.h
View File

@ -51,6 +51,7 @@ enum netdev_event {
NETDEV_EVENT_RSSI_LEVEL_NOTIFY, NETDEV_EVENT_RSSI_LEVEL_NOTIFY,
NETDEV_EVENT_PACKET_LOSS_NOTIFY, NETDEV_EVENT_PACKET_LOSS_NOTIFY,
NETDEV_EVENT_BEACON_LOSS_NOTIFY, NETDEV_EVENT_BEACON_LOSS_NOTIFY,
NETDEV_EVENT_ECC_GROUP_RETRY,
}; };
enum netdev_watch_event { enum netdev_watch_event {

15
src/station.c
View File

@ -3456,6 +3456,18 @@ static void station_event_roaming(struct station *station)
station_enter_state(station, STATION_STATE_FW_ROAMING); station_enter_state(station, STATION_STATE_FW_ROAMING);
} }
static void station_ecc_group_retry(struct station *station)
{
struct network *network = station_get_connected_network(station);
if (L_WARN_ON(!network))
return;
station_debug_event(station, "ecc-group-rejected");
network_set_force_default_ecc_group(network);
}
static void station_netdev_event(struct netdev *netdev, enum netdev_event event, static void station_netdev_event(struct netdev *netdev, enum netdev_event event,
void *event_data, void *user_data) void *event_data, void *user_data)
{ {
@ -3497,6 +3509,9 @@ static void station_netdev_event(struct netdev *netdev, enum netdev_event event,
case NETDEV_EVENT_BEACON_LOSS_NOTIFY: case NETDEV_EVENT_BEACON_LOSS_NOTIFY:
station_beacon_lost(station); station_beacon_lost(station);
break; break;
case NETDEV_EVENT_ECC_GROUP_RETRY:
station_ecc_group_retry(station);
break;
} }
} }