diff options
Diffstat (limited to 'plugins/wifi.c')
-rw-r--r-- | plugins/wifi.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index f175494e..c8b7e0a2 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -42,7 +42,6 @@ #include "supplicant.h" struct wifi_data { - GStaticMutex mutex; GSList *list; gchar *identifier; }; @@ -190,8 +189,6 @@ static void scan_result(struct connman_element *parent, temp[i] = g_ascii_tolower(temp[i]); } - g_static_mutex_lock(&data->mutex); - element = find_element(data, network->identifier); if (element == NULL) { element = connman_element_create(temp); @@ -210,8 +207,6 @@ static void scan_result(struct connman_element *parent, connman_element_register(element, parent); } - g_static_mutex_unlock(&data->mutex); - g_free(temp); } @@ -230,8 +225,6 @@ static int wifi_probe(struct connman_element *element) if (data == NULL) return -ENOMEM; - g_static_mutex_init(&data->mutex); - connman_element_set_data(element, data); return 0; @@ -282,8 +275,6 @@ static int wifi_disable(struct connman_element *element) __supplicant_disconnect(element); - g_static_mutex_lock(&data->mutex); - for (list = data->list; list; list = list->next) { struct connman_element *network = list->data; @@ -293,8 +284,6 @@ static int wifi_disable(struct connman_element *element) g_slist_free(data->list); data->list = NULL; - g_static_mutex_unlock(&data->mutex); - connman_element_unregister_children(element); return 0; @@ -311,7 +300,6 @@ static struct connman_driver wifi_driver = { .disable = wifi_disable, }; -static GStaticMutex device_mutex = G_STATIC_MUTEX_INIT; static GSList *device_list = NULL; static void wifi_newlink(unsigned short type, int index, @@ -344,8 +332,6 @@ static void wifi_newlink(unsigned short type, int index, close(sk); - g_static_mutex_lock(&device_mutex); - for (list = device_list; list; list = list->next) { struct connman_element *device = list->data; @@ -355,8 +341,6 @@ static void wifi_newlink(unsigned short type, int index, } } - g_static_mutex_unlock(&device_mutex); - if (exists == TRUE) { g_free(name); return; @@ -369,12 +353,8 @@ static void wifi_newlink(unsigned short type, int index, device->index = index; device->name = name; - g_static_mutex_lock(&device_mutex); - connman_element_register(device, NULL); device_list = g_slist_append(device_list, device); - - g_static_mutex_unlock(&device_mutex); } static void wifi_dellink(unsigned short type, int index, @@ -384,8 +364,6 @@ static void wifi_dellink(unsigned short type, int index, DBG("index %d", index); - g_static_mutex_lock(&device_mutex); - for (list = device_list; list; list = list->next) { struct connman_element *device = list->data; @@ -396,8 +374,6 @@ static void wifi_dellink(unsigned short type, int index, break; } } - - g_static_mutex_unlock(&device_mutex); } static struct connman_rtnl wifi_rtnl = { @@ -426,8 +402,6 @@ static void supplicant_disconnect(DBusConnection *connection, void *user_data) connman_rtnl_unregister(&wifi_rtnl); - g_static_mutex_lock(&device_mutex); - for (list = device_list; list; list = list->next) { struct connman_element *device = list->data; @@ -438,8 +412,6 @@ static void supplicant_disconnect(DBusConnection *connection, void *user_data) g_slist_free(device_list); device_list = NULL; - g_static_mutex_unlock(&device_mutex); - __supplicant_exit(); } |