Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

client: remove unused ordered networks from device

This commit is contained in:
Tim Kourt 2018-08-02 18:01:54 -07:00 committed by Denis Kenzior
parent 273d5d264a
commit 664723f427
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/device.c
View File

@ -41,7 +41,6 @@ struct device {
char *name; char *name;
char *state; char *state;
char *mode; char *mode;
struct l_queue *ordered_networks;
const struct proxy_interface *adapter; const struct proxy_interface *adapter;
const struct proxy_interface *connected_network; const struct proxy_interface *connected_network;
const struct proxy_interface *wsc; const struct proxy_interface *wsc;
@ -389,7 +388,6 @@ static void ordered_networks_display(struct l_queue *ordered_networks)
static void ordered_networks_callback(struct l_dbus_message *message, static void ordered_networks_callback(struct l_dbus_message *message,
void *proxy) void *proxy)
{ {
struct device *device = proxy_interface_get_data(proxy);
struct l_queue *networks = NULL; struct l_queue *networks = NULL;
struct ordered_network network; struct ordered_network network;
struct l_dbus_message_iter iter; struct l_dbus_message_iter iter;
@ -403,8 +401,6 @@ static void ordered_networks_callback(struct l_dbus_message *message,
return; return;
} }
l_queue_destroy(device->ordered_networks, ordered_networks_destroy);
while (l_dbus_message_iter_next_entry(&iter, while (l_dbus_message_iter_next_entry(&iter,
&network.network_path, &network.network_path,
&network.name, &network.name,
@ -423,9 +419,9 @@ static void ordered_networks_callback(struct l_dbus_message *message,
l_queue_push_tail(networks, net); l_queue_push_tail(networks, net);
} }
device->ordered_networks = networks;
ordered_networks_display(networks); ordered_networks_display(networks);
l_queue_destroy(networks, ordered_networks_destroy);
} }
static void *device_create(void) static void *device_create(void)
@ -442,8 +438,6 @@ static void device_destroy(void *data)
l_free(device->state); l_free(device->state);
l_free(device->mode); l_free(device->mode);
l_queue_destroy(device->ordered_networks, ordered_networks_destroy);
device->adapter = NULL; device->adapter = NULL;
device->connected_network = NULL; device->connected_network = NULL;
device->wsc = NULL; device->wsc = NULL;