Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

wiphy: Rework Device.Disconnect() logic

Browse Source
This commit is contained in:
Denis Kenzior 2015-04-08 15:03:28 -05:00
parent 6921e239a4
commit 313dcbb8ff
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wiphy.c
View File

@ -82,6 +82,7 @@ struct netdev {
struct l_hashmap *networks; struct l_hashmap *networks;
struct bss *connected_bss; struct bss *connected_bss;
struct l_dbus_message *connect_pending; struct l_dbus_message *connect_pending;
struct l_dbus_message *disconnect_pending;
struct l_io *eapol_io; struct l_io *eapol_io;
uint32_t pairwise_new_key_cmd_id; uint32_t pairwise_new_key_cmd_id;
@ -590,10 +591,17 @@ static struct l_dbus_message *device_get_networks(struct l_dbus *dbus,
static void genl_disconnect_cb(struct l_genl_msg *msg, void *user_data) static void genl_disconnect_cb(struct l_genl_msg *msg, void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
struct l_dbus_message *reply;
if (l_genl_msg_get_error(msg) < 0 && netdev->connect_pending) if (l_genl_msg_get_error(msg) < 0) {
dbus_pending_reply(&netdev->connect_pending, dbus_pending_reply(&netdev->disconnect_pending,
dbus_error_failed(netdev->connect_pending)); dbus_error_failed(netdev->disconnect_pending));
return;
}
reply = l_dbus_message_new_method_return(netdev->disconnect_pending);
l_dbus_message_set_arguments(reply, "");
dbus_pending_reply(&netdev->disconnect_pending, reply);
} }
static struct l_dbus_message *device_disconnect(struct l_dbus *dbus, static struct l_dbus_message *device_disconnect(struct l_dbus *dbus,
@ -623,7 +631,7 @@ static struct l_dbus_message *device_disconnect(struct l_dbus *dbus,
netdev->connected_bss->addr); netdev->connected_bss->addr);
l_genl_family_send(nl80211, msg, genl_disconnect_cb, netdev, NULL); l_genl_family_send(nl80211, msg, genl_disconnect_cb, netdev, NULL);
netdev->connect_pending = l_dbus_message_ref(message); netdev->disconnect_pending = l_dbus_message_ref(message);
return NULL; return NULL;
} }