Move ap_list_timer() to use common AP periodic cleanup mechanism

This reduces number of periodic eloop timeouts when AP mode operations
are in progress.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 78a1f7c..8bf6dde 100644 (file)
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -248,15 +248,12 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
 }
 
 
-static void ap_list_timer(void *eloop_ctx, void *timeout_ctx)
+void ap_list_timer(struct hostapd_iface *iface)
 {
-       struct hostapd_iface *iface = eloop_ctx;
        struct os_reltime now;
        struct ap_info *ap;
        int set_beacon = 0;
 
-       eloop_register_timeout(10, 0, ap_list_timer, iface, NULL);
-
        if (!iface->ap_list)
                return;
 
@@ -305,13 +302,11 @@ static void ap_list_timer(void *eloop_ctx, void *timeout_ctx)
 
 int ap_list_init(struct hostapd_iface *iface)
 {
-       eloop_register_timeout(10, 0, ap_list_timer, iface, NULL);
        return 0;
 }
 
 
 void ap_list_deinit(struct hostapd_iface *iface)
 {
-       eloop_cancel_timeout(ap_list_timer, iface, NULL);
        hostapd_free_aps(iface);
 }

diff --git a/src/ap/ap_list.h b/src/ap/ap_list.h
index 93dc0ed..9e0353c 100644 (file)
--- a/src/ap/ap_list.h
+++ b/src/ap/ap_list.h
@@ -39,6 +39,7 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
 #ifdef NEED_AP_MLME
 int ap_list_init(struct hostapd_iface *iface);
 void ap_list_deinit(struct hostapd_iface *iface);
+void ap_list_timer(struct hostapd_iface *iface);
 #else /* NEED_AP_MLME */
 static inline int ap_list_init(struct hostapd_iface *iface)
 {
@@ -48,6 +49,10 @@ static inline int ap_list_init(struct hostapd_iface *iface)
 static inline void ap_list_deinit(struct hostapd_iface *iface)
 {
 }
+
+static inline void ap_list_timer(struct hostapd_iface *iface)
+{
+}
 #endif /* NEED_AP_MLME */
 
 #endif /* AP_LIST_H */

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 0ae8f4a..c509ebf 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -2928,6 +2928,8 @@ void hostapd_periodic_iface(struct hostapd_iface *iface)
 {
        size_t i;
 
+       ap_list_timer(iface);
+
        for (i = 0; i < iface->num_bss; i++) {
                struct hostapd_data *hapd = iface->bss[i];