mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-25 09:39:25 +01:00
netdev: reuse NETDEV_EVENT_{AUTHENTICATING,ASSOCIATING}
The authenticating event was not used anymore and the associating event use was questionable (after the CMD_CONNECT callback). No other modules actually utilize these events but they are useful for autotests. Move these events around to map 1:1 when the kernel sends the auth/assoc events.
This commit is contained in:
parent
77cf621f15
commit
300f0ddac5
12
src/netdev.c
12
src/netdev.c
@ -2422,10 +2422,6 @@ static void netdev_driver_connected(struct netdev *netdev)
|
|||||||
{
|
{
|
||||||
netdev->connected = true;
|
netdev->connected = true;
|
||||||
|
|
||||||
if (netdev->event_filter)
|
|
||||||
netdev->event_filter(netdev, NETDEV_EVENT_ASSOCIATING, NULL,
|
|
||||||
netdev->user_data);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We register the eapol state machine here, in case the PAE
|
* We register the eapol state machine here, in case the PAE
|
||||||
* socket receives EAPoL packets before the nl80211 socket
|
* socket receives EAPoL packets before the nl80211 socket
|
||||||
@ -2919,6 +2915,10 @@ static void netdev_authenticate_event(struct l_genl_msg *msg,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (netdev->event_filter)
|
||||||
|
netdev->event_filter(netdev, NETDEV_EVENT_AUTHENTICATING,
|
||||||
|
NULL, netdev->user_data);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* During Fast Transition we use the authenticate event to start the
|
* During Fast Transition we use the authenticate event to start the
|
||||||
* reassociation step because the FTE necessary before we can build
|
* reassociation step because the FTE necessary before we can build
|
||||||
@ -3040,6 +3040,10 @@ static void netdev_associate_event(struct l_genl_msg *msg,
|
|||||||
if (!netdev->connected || netdev->aborting)
|
if (!netdev->connected || netdev->aborting)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (netdev->event_filter)
|
||||||
|
netdev->event_filter(netdev, NETDEV_EVENT_ASSOCIATING,
|
||||||
|
NULL, netdev->user_data);
|
||||||
|
|
||||||
if (!netdev->ap && !netdev->in_ft) {
|
if (!netdev->ap && !netdev->in_ft) {
|
||||||
netdev->associated = true;
|
netdev->associated = true;
|
||||||
netdev->in_reassoc = false;
|
netdev->in_reassoc = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user