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

netdev: Drop netdev->remote_addr

This commit is contained in:
Andrew Zaborowski 2016-12-12 18:34:21 +01:00 committed by Denis Kenzior
parent b99c89fd35
commit a750b7067a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/netdev.c
View File

@ -65,7 +65,6 @@ struct netdev {
void *user_data; void *user_data;
struct eapol_sm *sm; struct eapol_sm *sm;
struct handshake_state *handshake; struct handshake_state *handshake;
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;
uint32_t group_new_key_cmd_id; uint32_t group_new_key_cmd_id;
@ -460,7 +459,7 @@ static void netdev_rekey_offload_event(struct l_genl_msg *msg,
replay_ctr = *((uint64_t *) data); replay_ctr = *((uint64_t *) data);
__eapol_update_replay_counter(netdev->index, __eapol_update_replay_counter(netdev->index,
netdev->addr, netdev->addr,
netdev->remote_addr, netdev->handshake->aa,
replay_ctr); replay_ctr);
return; return;
} }
@ -559,7 +558,7 @@ static struct l_genl_msg *netdev_build_cmd_deauthenticate(struct netdev *netdev,
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index); 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); l_genl_msg_append_attr(msg, NL80211_ATTR_REASON_CODE, 2, &reason_code);
l_genl_msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN, l_genl_msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN,
netdev->remote_addr); netdev->handshake->aa);
return msg; return msg;
} }
@ -655,8 +654,8 @@ static struct l_genl_msg *netdev_build_cmd_set_station(struct netdev *netdev)
msg = l_genl_msg_new_sized(NL80211_CMD_SET_STATION, 512); msg = l_genl_msg_new_sized(NL80211_CMD_SET_STATION, 512);
l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index); l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &netdev->index);
l_genl_msg_append_attr(msg, NL80211_ATTR_MAC, l_genl_msg_append_attr(msg, NL80211_ATTR_MAC, ETH_ALEN,
ETH_ALEN, netdev->remote_addr); netdev->handshake->aa);
l_genl_msg_append_attr(msg, NL80211_ATTR_STA_FLAGS2, l_genl_msg_append_attr(msg, NL80211_ATTR_STA_FLAGS2,
sizeof(struct nl80211_sta_flag_update), &flags); sizeof(struct nl80211_sta_flag_update), &flags);
@ -1365,7 +1364,6 @@ static int netdev_connect_common(struct netdev *netdev,
netdev->event_filter = event_filter; netdev->event_filter = event_filter;
netdev->connect_cb = cb; netdev->connect_cb = cb;
netdev->user_data = user_data; netdev->user_data = user_data;
memcpy(netdev->remote_addr, bss->addr, ETH_ALEN);
netdev->connected = true; netdev->connected = true;
netdev->handshake = hs; netdev->handshake = hs;
netdev->sm = sm; netdev->sm = sm;