diff options
| author | James Prestwood <prestwoj@gmail.com> | 2020-05-04 08:24:20 -0700 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2020-05-01 19:55:18 -0500 |
| commit | dfb6f7f0252c003c22ba949390af780fd6ab5b98 (patch) | |
| tree | 0a6657c33a275d51c1b72faf2671a9bf04b48b8f | |
| parent | 1c75f636ed18ff224ca81da411fe67e2cb9d9b90 (diff) | |
| download | iwd-dfb6f7f0252c003c22ba949390af780fd6ab5b98.tar.gz | |
wiphy: restrict FT AKMs when not supported
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.
| -rw-r--r-- | src/wiphy.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/wiphy.c b/src/wiphy.c index 9821da0e3..aef395494 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -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) && - bss->rsne && bss->mde_present) + bss->rsne && bss->mde_present && + wiphy->support_cmds_auth_assoc) return IE_RSN_AKM_SUITE_FT_OVER_8021X; 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 && wiphy_has_feature(wiphy, NL80211_FEATURE_SAE) && info.mfpr) { - if (info.akm_suites & - IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) + if ((info.akm_suites & + IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) && + wiphy->support_cmds_auth_assoc) return IE_RSN_AKM_SUITE_FT_OVER_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) && - bss->rsne && bss->mde_present) + bss->rsne && bss->mde_present && + wiphy->support_cmds_auth_assoc) return IE_RSN_AKM_SUITE_FT_USING_PSK; if (info.akm_suites & IE_RSN_AKM_SUITE_PSK_SHA256) |