Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 15:20:42 +01:00
Code Releases Activity

netdev: Use CMD_DISCONNECT for non-FT cases

Browse Source 
CMD_DEAUTHENTICATE is not available for FullMAC based cards.  We already
use CMD_CONNECT in the non-FT cases, which works on all cards.  However,
for some reason we kept using CMD_DEAUTHENTICATE instead of CMD_DISCONNECT.

For FT (error) cases, keep using CMD_DEAUTHENTICATE.
This commit is contained in:
Denis Kenzior 2017-05-31 11:08:40 -05:00
parent a647072e02
commit 21fffe2629
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/netdev.c
View File

@ -666,14 +666,7 @@ static void netdev_disconnect_event(struct l_genl_msg *msg,
event_data); event_data);
} }
static void netdev_deauthenticate_event(struct l_genl_msg *msg, static void netdev_cmd_disconnect_cb(struct l_genl_msg *msg, void *user_data)
struct netdev *netdev)
{
l_debug("");
}
static void netdev_cmd_deauthenticate_cb(struct l_genl_msg *msg,
void *user_data)
{ {
struct netdev *netdev = user_data; struct netdev *netdev = user_data;
void *disconnect_data; void *disconnect_data;
@ -700,6 +693,24 @@ static void netdev_cmd_deauthenticate_cb(struct l_genl_msg *msg,
disconnect_cb(netdev, r, disconnect_data); disconnect_cb(netdev, r, disconnect_data);
} }
static struct l_genl_msg *netdev_build_cmd_disconnect(struct netdev *netdev,
uint16_t reason_code)
{
struct l_genl_msg *msg;
msg = l_genl_msg_new_sized(NL80211_CMD_DISCONNECT, 64);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index);
l_genl_msg_append_attr(msg, NL80211_ATTR_REASON_CODE, 2, &reason_code);
return msg;
}
static void netdev_deauthenticate_event(struct l_genl_msg *msg,
struct netdev *netdev)
{
l_debug("");
}
static struct l_genl_msg *netdev_build_cmd_deauthenticate(struct netdev *netdev, static struct l_genl_msg *netdev_build_cmd_deauthenticate(struct netdev *netdev,
uint16_t reason_code) uint16_t reason_code)
{ {
@ -760,8 +771,7 @@ static void netdev_setting_keys_failed(struct netdev *netdev,
netdev->group_management_new_key_cmd_id = 0; netdev->group_management_new_key_cmd_id = 0;
netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED; netdev->result = NETDEV_RESULT_KEY_SETTING_FAILED;
msg = netdev_build_cmd_deauthenticate(netdev, msg = netdev_build_cmd_disconnect(netdev, MPDU_REASON_CODE_UNSPECIFIED);
MPDU_REASON_CODE_UNSPECIFIED);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed, netdev_connect_failed,
netdev, NULL); netdev, NULL);
@ -1133,7 +1143,7 @@ static void netdev_handshake_failed(uint32_t ifindex,
netdev->sm = NULL; netdev->sm = NULL;
netdev->result = NETDEV_RESULT_HANDSHAKE_FAILED; netdev->result = NETDEV_RESULT_HANDSHAKE_FAILED;
msg = netdev_build_cmd_deauthenticate(netdev, reason_code); msg = netdev_build_cmd_disconnect(netdev, reason_code);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg, netdev->disconnect_cmd_id = l_genl_family_send(nl80211, msg,
netdev_connect_failed, netdev_connect_failed,
netdev, NULL); netdev, NULL);
@ -2140,7 +2150,7 @@ error:
int netdev_disconnect(struct netdev *netdev, int netdev_disconnect(struct netdev *netdev,
netdev_disconnect_cb_t cb, void *user_data) netdev_disconnect_cb_t cb, void *user_data)
{ {
struct l_genl_msg *deauthenticate; struct l_genl_msg *disconnect;
if (!netdev->connected) if (!netdev->connected)
return -ENOTCONN; return -ENOTCONN;
@ -2148,10 +2158,6 @@ int netdev_disconnect(struct netdev *netdev,
if (netdev->disconnect_cmd_id) if (netdev->disconnect_cmd_id)
return -EINPROGRESS; return -EINPROGRESS;
/* Build deauthenticate prior to handshake_state being cleared */
deauthenticate = netdev_build_cmd_deauthenticate(netdev,
MPDU_REASON_CODE_DEAUTH_LEAVING);
/* Only perform this if we haven't successfully fully associated yet */ /* Only perform this if we haven't successfully fully associated yet */
if (!netdev->operational) { if (!netdev->operational) {
netdev->result = NETDEV_RESULT_ABORTED; netdev->result = NETDEV_RESULT_ABORTED;
@ -2160,11 +2166,13 @@ int netdev_disconnect(struct netdev *netdev,
netdev_connect_free(netdev); netdev_connect_free(netdev);
} }
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, deauthenticate, disconnect = netdev_build_cmd_disconnect(netdev,
netdev_cmd_deauthenticate_cb, netdev, NULL); MPDU_REASON_CODE_DEAUTH_LEAVING);
netdev->disconnect_cmd_id = l_genl_family_send(nl80211, disconnect,
netdev_cmd_disconnect_cb, netdev, NULL);
if (!netdev->disconnect_cmd_id) { if (!netdev->disconnect_cmd_id) {
l_genl_msg_unref(deauthenticate); l_genl_msg_unref(disconnect);
return -EIO; return -EIO;
} }