A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

cfg80211: use separate struct for FILS parameters

Browse source 
Put FILS related parameters into their own struct definition so
it can be reused for roam events in subsequent change.

Reviewed-by: Jithu Jance <[email protected]>
Reviewed-by: Eylon Pedinovsky <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
This commit is contained in:
Arend Van Spriel 2018-05-22 10:19:06 +02:00 • committed by Johannes Berg
commit 76804d28c3
3 changed files with 58 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

22
net/wireless/nl80211.c
View file

@ -14206,8 +14206,8 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
void *hdr;
msg = nlmsg_new(100 + cr->req_ie_len + cr->resp_ie_len +
cr->fils_kek_len + cr->pmk_len +
(cr->pmkid ? WLAN_PMKID_LEN : 0), gfp);
cr->fils.kek_len + cr->fils.pmk_len +
(cr->fils.pmkid ? WLAN_PMKID_LEN : 0), gfp);
if (!msg)
return;
@ -14233,17 +14233,17 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev,
(cr->resp_ie &&
nla_put(msg, NL80211_ATTR_RESP_IE, cr->resp_ie_len,
cr->resp_ie)) ||
(cr->update_erp_next_seq_num &&
(cr->fils.update_erp_next_seq_num &&
nla_put_u16(msg, NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM,
cr->fils_erp_next_seq_num)) ||
cr->fils.erp_next_seq_num)) ||
(cr->status == WLAN_STATUS_SUCCESS &&
((cr->fils_kek &&
nla_put(msg, NL80211_ATTR_FILS_KEK, cr->fils_kek_len,
cr->fils_kek)) ||
(cr->pmk &&
nla_put(msg, NL80211_ATTR_PMK, cr->pmk_len, cr->pmk)) ||
(cr->pmkid &&
nla_put(msg, NL80211_ATTR_PMKID, WLAN_PMKID_LEN, cr->pmkid)))))
((cr->fils.kek &&
nla_put(msg, NL80211_ATTR_FILS_KEK, cr->fils.kek_len,
cr->fils.kek)) ||
(cr->fils.pmk &&
nla_put(msg, NL80211_ATTR_PMK, cr->fils.pmk_len, cr->fils.pmk)) ||
(cr->fils.pmkid &&
nla_put(msg, NL80211_ATTR_PMKID, WLAN_PMKID_LEN, cr->fils.pmkid)))))
goto nla_put_failure;
genlmsg_end(msg, hdr);

40
net/wireless/sme.c
View file

@ -803,8 +803,8 @@ void cfg80211_connect_done(struct net_device *dev,
ev = kzalloc(sizeof(*ev) + (params->bssid ? ETH_ALEN : 0) +
params->req_ie_len + params->resp_ie_len +
params->fils_kek_len + params->pmk_len +
(params->pmkid ? WLAN_PMKID_LEN : 0), gfp);
params->fils.kek_len + params->fils.pmk_len +
(params->fils.pmkid ? WLAN_PMKID_LEN : 0), gfp);
if (!ev) {
cfg80211_put_bss(wdev->wiphy, params->bss);
return;
@ -831,27 +831,29 @@ void cfg80211_connect_done(struct net_device *dev,
params->resp_ie_len);
next += params->resp_ie_len;
}
if (params->fils_kek_len) {
ev->cr.fils_kek = next;
ev->cr.fils_kek_len = params->fils_kek_len;
memcpy((void *)ev->cr.fils_kek, params->fils_kek,
params->fils_kek_len);
next += params->fils_kek_len;
if (params->fils.kek_len) {
ev->cr.fils.kek = next;
ev->cr.fils.kek_len = params->fils.kek_len;
memcpy((void *)ev->cr.fils.kek, params->fils.kek,
params->fils.kek_len);
next += params->fils.kek_len;
}
if (params->pmk_len) {
ev->cr.pmk = next;
ev->cr.pmk_len = params->pmk_len;
memcpy((void *)ev->cr.pmk, params->pmk, params->pmk_len);
next += params->pmk_len;
if (params->fils.pmk_len) {
ev->cr.fils.pmk = next;
ev->cr.fils.pmk_len = params->fils.pmk_len;
memcpy((void *)ev->cr.fils.pmk, params->fils.pmk,
params->fils.pmk_len);
next += params->fils.pmk_len;
}
if (params->pmkid) {
ev->cr.pmkid = next;
memcpy((void *)ev->cr.pmkid, params->pmkid, WLAN_PMKID_LEN);
if (params->fils.pmkid) {
ev->cr.fils.pmkid = next;
memcpy((void *)ev->cr.fils.pmkid, params->fils.pmkid,
WLAN_PMKID_LEN);
next += WLAN_PMKID_LEN;
}
ev->cr.update_erp_next_seq_num = params->update_erp_next_seq_num;
if (params->update_erp_next_seq_num)
ev->cr.fils_erp_next_seq_num = params->fils_erp_next_seq_num;
ev->cr.fils.update_erp_next_seq_num = params->fils.update_erp_next_seq_num;
if (params->fils.update_erp_next_seq_num)
ev->cr.fils.erp_next_seq_num = params->fils.erp_next_seq_num;
if (params->bss)
cfg80211_hold_bss(bss_from_pub(params->bss));
ev->cr.bss = params->bss;