diff options
author | Jouni Malinen <jouni@qca.qualcomm.com> | 2016-10-26 17:42:04 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-10-27 10:03:25 -0400 |
commit | dbc0c2cb2f0a02fcb034732cb3d55ea6359b9c8b (patch) | |
tree | 71540f1108159d82c02e55b6ca17dd900aae475b /net/mac80211/mlme.c | |
parent | 348bd456699801920a309c66e382380809fbdf41 (diff) |
mac80211: Add FILS auth alg mapping
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 00db34b204db..bf553797bdff 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2618,6 +2618,9 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, | |||
2618 | case WLAN_AUTH_LEAP: | 2618 | case WLAN_AUTH_LEAP: |
2619 | case WLAN_AUTH_FT: | 2619 | case WLAN_AUTH_FT: |
2620 | case WLAN_AUTH_SAE: | 2620 | case WLAN_AUTH_SAE: |
2621 | case WLAN_AUTH_FILS_SK: | ||
2622 | case WLAN_AUTH_FILS_SK_PFS: | ||
2623 | case WLAN_AUTH_FILS_PK: | ||
2621 | break; | 2624 | break; |
2622 | case WLAN_AUTH_SHARED_KEY: | 2625 | case WLAN_AUTH_SHARED_KEY: |
2623 | if (ifmgd->auth_data->expected_transaction != 4) { | 2626 | if (ifmgd->auth_data->expected_transaction != 4) { |
@@ -4479,6 +4482,15 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, | |||
4479 | case NL80211_AUTHTYPE_SAE: | 4482 | case NL80211_AUTHTYPE_SAE: |
4480 | auth_alg = WLAN_AUTH_SAE; | 4483 | auth_alg = WLAN_AUTH_SAE; |
4481 | break; | 4484 | break; |
4485 | case NL80211_AUTHTYPE_FILS_SK: | ||
4486 | auth_alg = WLAN_AUTH_FILS_SK; | ||
4487 | break; | ||
4488 | case NL80211_AUTHTYPE_FILS_SK_PFS: | ||
4489 | auth_alg = WLAN_AUTH_FILS_SK_PFS; | ||
4490 | break; | ||
4491 | case NL80211_AUTHTYPE_FILS_PK: | ||
4492 | auth_alg = WLAN_AUTH_FILS_PK; | ||
4493 | break; | ||
4482 | default: | 4494 | default: |
4483 | return -EOPNOTSUPP; | 4495 | return -EOPNOTSUPP; |
4484 | } | 4496 | } |