The pending_network variable no longer does anything useful. --- plugins/wifi.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/plugins/wifi.c b/plugins/wifi.c index 58d8bb2..456e6a3 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -112,7 +112,6 @@ struct wifi_data { char *identifier; struct connman_device *device; struct connman_network *network; - struct connman_network *pending_network; GSList *networks; GSupplicantInterface *interface; GSupplicantState state; @@ -1500,9 +1499,6 @@ static int wifi_disable(struct connman_device *device) wifi->connected = false; wifi->disconnecting = false; - if (wifi->pending_network) - wifi->pending_network = NULL; - stop_autoscan(device); if (wifi->p2p_find_timeout) { @@ -2066,7 +2062,6 @@ static int network_connect(struct connman_network *network) ssid_init(ssid, network); if (wifi->disconnecting) { - wifi->pending_network = network; g_free(ssid); } else { wifi->network = connman_network_ref(network); @@ -2099,11 +2094,6 @@ static void disconnect_callback(int result, GSupplicantInterface *interface, wifi->disconnecting = false; - if (wifi->pending_network) { - network_connect(wifi->pending_network); - wifi->pending_network = NULL; - } - start_autoscan(wifi->device); } @@ -3068,8 +3058,7 @@ static int enable_wifi_tethering(struct connman_technology *technology, for (list = iface_list; list; list = list->next) { wifi = list->data; - DBG("wifi %p network %p pending_network %p", wifi, - wifi->network, wifi->pending_network); + DBG("wifi %p network %p", wifi, wifi->network); interface = wifi->interface; -- 2.1.4 _______________________________________________ connman mailing list connman@connman.net https://lists.connman.net/mailman/listinfo/connman