Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 09:39:25 +01:00
Code Releases Activity

wiphy: restrict FT AKMs when not supported

Browse Source 
Some full mac cards don't like being given a FT AKM when connecting.
From an API perspective this should be supported, but in practice
these cards behave differently and some do no accept FT AKMs. Until
this becomes more stable any cards not supporting Auth/Assoc commands
(full mac) will not connect using FT AKMs.
This commit is contained in:
James Prestwood 2020-05-04 08:24:20 -07:00 committed by Denis Kenzior
parent 1c75f636ed
commit dfb6f7f025
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wiphy.c
View File

@ -157,7 +157,8 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
} }
if ((info.akm_suites & IE_RSN_AKM_SUITE_FT_OVER_8021X) && if ((info.akm_suites & IE_RSN_AKM_SUITE_FT_OVER_8021X) &&
bss->rsne && bss->mde_present) bss->rsne && bss->mde_present &&
wiphy->support_cmds_auth_assoc)
return IE_RSN_AKM_SUITE_FT_OVER_8021X; return IE_RSN_AKM_SUITE_FT_OVER_8021X;
if (info.akm_suites & IE_RSN_AKM_SUITE_8021X_SHA256) if (info.akm_suites & IE_RSN_AKM_SUITE_8021X_SHA256)
@ -175,8 +176,9 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
if (wiphy->supported_ciphers & IE_RSN_CIPHER_SUITE_BIP && if (wiphy->supported_ciphers & IE_RSN_CIPHER_SUITE_BIP &&
wiphy_has_feature(wiphy, NL80211_FEATURE_SAE) && wiphy_has_feature(wiphy, NL80211_FEATURE_SAE) &&
info.mfpr) { info.mfpr) {
if (info.akm_suites & if ((info.akm_suites &
IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) &&
wiphy->support_cmds_auth_assoc)
return IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256; return IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256;
if (info.akm_suites & IE_RSN_AKM_SUITE_SAE_SHA256) if (info.akm_suites & IE_RSN_AKM_SUITE_SAE_SHA256)
@ -184,7 +186,8 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
} }
if ((info.akm_suites & IE_RSN_AKM_SUITE_FT_USING_PSK) && if ((info.akm_suites & IE_RSN_AKM_SUITE_FT_USING_PSK) &&
bss->rsne && bss->mde_present) bss->rsne && bss->mde_present &&
wiphy->support_cmds_auth_assoc)
return IE_RSN_AKM_SUITE_FT_USING_PSK; return IE_RSN_AKM_SUITE_FT_USING_PSK;
if (info.akm_suites & IE_RSN_AKM_SUITE_PSK_SHA256) if (info.akm_suites & IE_RSN_AKM_SUITE_PSK_SHA256)