Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-23 06:02:37 +01:00
Code Releases Activity

eapol: Remove io argument from eapol_start

Browse Source
This commit is contained in:
Denis Kenzior 2016-09-13 17:36:26 -05:00
parent 047a196c70
commit db8794460f
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eapol.c
View File

@ -1732,7 +1732,7 @@ static bool eapol_get_nonce(uint8_t nonce[])
return l_getrandom(nonce, 32); return l_getrandom(nonce, 32);
} }
void eapol_start(uint32_t ifindex, struct l_io *io, struct eapol_sm *sm) void eapol_start(uint32_t ifindex, struct eapol_sm *sm)
{ {
sm->ifindex = ifindex; sm->ifindex = ifindex;
sm->timeout = l_timeout_create(2, eapol_timeout, sm, NULL); sm->timeout = l_timeout_create(2, eapol_timeout, sm, NULL);

2
src/eapol.h
View File

@ -206,7 +206,7 @@ uint32_t eapol_sm_get_pairwise_cipher(struct eapol_sm *sm);
uint32_t eapol_sm_get_group_cipher(struct eapol_sm *sm); uint32_t eapol_sm_get_group_cipher(struct eapol_sm *sm);
const uint8_t *eapol_sm_get_own_ie(struct eapol_sm *sm, size_t *out_ie_len); const uint8_t *eapol_sm_get_own_ie(struct eapol_sm *sm, size_t *out_ie_len);
void eapol_start(uint32_t ifindex, struct l_io *io, struct eapol_sm *sm); void eapol_start(uint32_t ifindex, struct eapol_sm *sm);
void eapol_cancel(uint32_t ifindex); void eapol_cancel(uint32_t ifindex);
void eapol_pae_open(); void eapol_pae_open();

7
src/netdev.c
View File

@ -62,7 +62,6 @@ struct netdev {
netdev_disconnect_cb_t disconnect_cb; netdev_disconnect_cb_t disconnect_cb;
void *user_data; void *user_data;
struct eapol_sm *sm; struct eapol_sm *sm;
struct l_io *eapol_io;
uint8_t remote_addr[ETH_ALEN]; uint8_t remote_addr[ETH_ALEN];
uint32_t pairwise_new_key_cmd_id; uint32_t pairwise_new_key_cmd_id;
uint32_t pairwise_set_key_cmd_id; uint32_t pairwise_set_key_cmd_id;
@ -271,9 +270,6 @@ static void netdev_connect_free(struct netdev *netdev)
if (netdev->sm) { if (netdev->sm) {
eapol_sm_free(netdev->sm); eapol_sm_free(netdev->sm);
netdev->sm = NULL; netdev->sm = NULL;
l_io_destroy(netdev->eapol_io);
netdev->eapol_io = NULL;
} }
if (netdev->eapol_active) { if (netdev->eapol_active) {
@ -993,11 +989,10 @@ static void netdev_connect_event(struct l_genl_msg *msg,
goto error; goto error;
if (netdev->sm) { if (netdev->sm) {
eapol_start(netdev->index, netdev->eapol_io, netdev->sm); eapol_start(netdev->index, netdev->sm);
netdev->eapol_active = true; netdev->eapol_active = true;
netdev->sm = NULL; netdev->sm = NULL;
netdev->eapol_io = NULL;
if (netdev->event_filter) if (netdev->event_filter)
netdev->event_filter(netdev, netdev->event_filter(netdev,