From 0e106d8534d908758f3e67f8e5ea6984179e3dbf Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 16 May 2016 16:14:15 -0500 Subject: [PATCH] wiphy: Use network_bss_* api --- src/wiphy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wiphy.c b/src/wiphy.c index 08244e2d..4120c195 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -1279,20 +1279,20 @@ static void network_reset_bss_list(const void *key, void *value, { struct network *network = value; - l_queue_destroy(network->bss_list, NULL); - network->bss_list = l_queue_new(); + network_bss_list_clear(network); } static bool network_remove_if_lost(const void *key, void *data, void *user_data) { struct network *network = data; - if (!l_queue_isempty(network->bss_list)) + if (!network_bss_list_isempty(network)) + return false; return false; l_debug("No remaining BSSs for SSID: %s -- Removing network", network_get_ssid(network)); - network_free(network); + network_remove(network); return true; } @@ -1381,7 +1381,7 @@ static void process_bss(struct netdev *netdev, struct scan_bss *bss) network_seen(security, network_get_ssid(network)); } - l_queue_insert(network->bss_list, bss, scan_bss_rank_compare, NULL); + network_bss_add(network, bss); rankmod = network_rankmod(security, network_get_ssid(network)); if (rankmod == 0.0) @@ -1425,7 +1425,7 @@ static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex, l_warn("Connected BSS not in scan results!"); l_queue_push_tail(netdev->bss_list, netdev->connected_bss); - l_queue_push_tail(netdev->connected_network->bss_list, + network_bss_add(netdev->connected_network, netdev->connected_bss); l_queue_remove(netdev->old_bss_list, netdev->connected_bss);