Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbbc5cd1 authored by Ilan Peer's avatar Ilan Peer Committed by Greg Kroah-Hartman
Browse files

mac80211: Adjust SAE authentication timeout 



[ Upstream commit 407879b690ba3a6bf29be896d02dad63463bd1c0 ]

The IEEE P802.11-REVmd D1.0 specification updated the SAE authentication
timeout to be 2000 milliseconds (see dot11RSNASAERetransPeriod). Update
the SAE timeout setting accordingly.

While at it, reduce some code duplication in the timeout configuration.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6f92551

net/mac80211/mlme.c

+18 −7
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define IEEE80211_AUTH_TIMEOUT		(HZ / 5)

#define IEEE80211_AUTH_TIMEOUT_LONG	(HZ / 2)

#define IEEE80211_AUTH_TIMEOUT_SHORT	(HZ / 10)

#define IEEE80211_AUTH_TIMEOUT_SAE	(HZ * 2)

#define IEEE80211_AUTH_MAX_TRIES	3

#define IEEE80211_AUTH_WAIT_ASSOC	(HZ * 5)

#define IEEE80211_ASSOC_TIMEOUT		(HZ / 5)
@@ -3464,15 +3465,18 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) 
	}



	if (tx_flags == 0) {

		if (auth_data->algorithm == WLAN_AUTH_SAE)

			auth_data->timeout = jiffies +

				IEEE80211_AUTH_TIMEOUT_SAE;

		else

			auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;

		auth_data->timeout_started = true;

		run_again(sdata, auth_data->timeout);

	} else {

		auth_data->timeout =

			round_jiffies_up(jiffies + IEEE80211_AUTH_TIMEOUT_LONG);

	}



	auth_data->timeout_started = true;

	run_again(sdata, auth_data->timeout);

	}



	return 0;

}
@@ -3545,8 +3549,15 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) 
		if (ifmgd->auth_data &&

		    (ieee80211_is_probe_req(fc) || ieee80211_is_auth(fc))) {

			if (status_acked) {

				if (ifmgd->auth_data->algorithm ==

				    WLAN_AUTH_SAE)

					ifmgd->auth_data->timeout =

						jiffies +

						IEEE80211_AUTH_TIMEOUT_SAE;

				else

					ifmgd->auth_data->timeout =

					jiffies + IEEE80211_AUTH_TIMEOUT_SHORT;

						jiffies +

						IEEE80211_AUTH_TIMEOUT_SHORT;

				run_again(sdata, ifmgd->auth_data->timeout);

			} else {

				ifmgd->auth_data->timeout = jiffies - 1;