3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-16 17:09:24 +01:00

netdev: add NETDEV_RESULT_DISCONNECTED

This new result is meant to handle cases where a disconnect
event (deauth/disassoc) was received during an ongoing connection.
Whether that's during authentication, association, the 4-way
handshake, or key setting.
This commit is contained in:
James Prestwood 2024-07-18 04:45:05 -07:00 committed by Denis Kenzior
parent 9ea0117dc4
commit 38c36ff145
3 changed files with 4 additions and 0 deletions

View File

@ -36,6 +36,7 @@ enum netdev_result {
NETDEV_RESULT_HANDSHAKE_FAILED, NETDEV_RESULT_HANDSHAKE_FAILED,
NETDEV_RESULT_KEY_SETTING_FAILED, NETDEV_RESULT_KEY_SETTING_FAILED,
NETDEV_RESULT_ABORTED, NETDEV_RESULT_ABORTED,
NETDEV_RESULT_DISCONNECTED,
}; };
enum netdev_event { enum netdev_event {
@ -86,6 +87,7 @@ typedef void (*netdev_command_cb_t)(struct netdev *netdev, int result,
* NETDEV_RESULT_HANDSHAKE_FAILED - MMPDU_REASON_CODE * NETDEV_RESULT_HANDSHAKE_FAILED - MMPDU_REASON_CODE
* NETDEV_RESULT_KEY_SETTING_FAILED - unused * NETDEV_RESULT_KEY_SETTING_FAILED - unused
* NETDEV_RESULT_ABORTED - unused. * NETDEV_RESULT_ABORTED - unused.
* NETDEV_RESULT_DISCONNECTED - MMPDU_REASON_CODE
*/ */
typedef void (*netdev_connect_cb_t)(struct netdev *netdev, typedef void (*netdev_connect_cb_t)(struct netdev *netdev,
enum netdev_result result, enum netdev_result result,

View File

@ -1366,6 +1366,7 @@ static void p2p_netdev_connect_cb(struct netdev *netdev,
case NETDEV_RESULT_ASSOCIATION_FAILED: case NETDEV_RESULT_ASSOCIATION_FAILED:
case NETDEV_RESULT_HANDSHAKE_FAILED: case NETDEV_RESULT_HANDSHAKE_FAILED:
case NETDEV_RESULT_KEY_SETTING_FAILED: case NETDEV_RESULT_KEY_SETTING_FAILED:
case NETDEV_RESULT_DISCONNECTED:
/* /*
* In the AUTHENTICATION_FAILED and ASSOCIATION_FAILED * In the AUTHENTICATION_FAILED and ASSOCIATION_FAILED
* cases there's nothing to disconnect. In the * cases there's nothing to disconnect. In the

View File

@ -3319,6 +3319,7 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result,
blacklist_remove_bss(station->connected_bss->addr); blacklist_remove_bss(station->connected_bss->addr);
station_connect_ok(station); station_connect_ok(station);
return; return;
case NETDEV_RESULT_DISCONNECTED:
case NETDEV_RESULT_HANDSHAKE_FAILED: case NETDEV_RESULT_HANDSHAKE_FAILED:
/* reason code in this case */ /* reason code in this case */
if (station_retry_with_reason(station, l_get_u16(event_data))) if (station_retry_with_reason(station, l_get_u16(event_data)))