From 300f0ddac5705de9cf919d560329381f73a25e74 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Tue, 25 Jun 2024 06:06:20 -0700 Subject: [PATCH] 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. --- src/netdev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index bada1ab5..153001ab 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -2422,10 +2422,6 @@ static void netdev_driver_connected(struct netdev *netdev) { 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 * socket receives EAPoL packets before the nl80211 socket @@ -2919,6 +2915,10 @@ static void netdev_authenticate_event(struct l_genl_msg *msg, 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 * 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) return; + if (netdev->event_filter) + netdev->event_filter(netdev, NETDEV_EVENT_ASSOCIATING, + NULL, netdev->user_data); + if (!netdev->ap && !netdev->in_ft) { netdev->associated = true; netdev->in_reassoc = false;