mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
mac80211: Adjust SAE authentication timeout
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: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
d1361b32e6
commit
407879b690
1 changed files with 18 additions and 7 deletions
|
@ -36,6 +36,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)
|
||||
|
@ -3814,16 +3815,19 @@ static int ieee80211_auth(struct ieee80211_sub_if_data *sdata)
|
|||
tx_flags);
|
||||
|
||||
if (tx_flags == 0) {
|
||||
auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
|
||||
auth_data->timeout_started = true;
|
||||
run_again(sdata, auth_data->timeout);
|
||||
if (auth_data->algorithm == WLAN_AUTH_SAE)
|
||||
auth_data->timeout = jiffies +
|
||||
IEEE80211_AUTH_TIMEOUT_SAE;
|
||||
else
|
||||
auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
|
||||
} else {
|
||||
auth_data->timeout =
|
||||
round_jiffies_up(jiffies + IEEE80211_AUTH_TIMEOUT_LONG);
|
||||
auth_data->timeout_started = true;
|
||||
run_again(sdata, auth_data->timeout);
|
||||
}
|
||||
|
||||
auth_data->timeout_started = true;
|
||||
run_again(sdata, auth_data->timeout);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -3894,8 +3898,15 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
|
|||
ifmgd->status_received = false;
|
||||
if (ifmgd->auth_data && ieee80211_is_auth(fc)) {
|
||||
if (status_acked) {
|
||||
ifmgd->auth_data->timeout =
|
||||
jiffies + IEEE80211_AUTH_TIMEOUT_SHORT;
|
||||
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;
|
||||
run_again(sdata, ifmgd->auth_data->timeout);
|
||||
} else {
|
||||
ifmgd->auth_data->timeout = jiffies - 1;
|
||||
|
|
Loading…
Reference in a new issue