mac80211: fix mlme timeouts
Johannes Berg
maintainerPATCH 1/1 mac80211: fix mlme timeouts
When a new MLME work is created, its timeout is initialised to 0. This is wrong, it could then be thought of as having an actual timeout in the future (time_is_after_jiffies() can return true). Instead, it should be initialised to jiffies so that it will run right away as soon as the mlme work is executed.
---
This time CC to the list, sorry.
net/mac80211/mlme.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/mlme.c +3 -0
@@ -1657,6 +1657,7 @@ static void ieee80211_rx_mgmt_probe_resp sdata->dev->name); wk->tries =0 ; wk->state =IEEE80211_MGD_STATE_AUTH ; + wk->timeout = jiffies;/* run again right away */ WARN_ON (ieee80211_authenticate (sdata, wk) !=RX_MGMT_NONE ); }
@@ -2374,6 +2375,7 @@ int ieee80211_mgd_auth(struct ieee80211_ wk->state =IEEE80211_MGD_STATE_PROBE ; wk->auth_alg = auth_alg; + wk->timeout = jiffies;/* run right away */ /* * XXX: if still associated need to tell AP that we're going
@@ -2445,6 +2447,7 @@ int ieee80211_mgd_assoc(struct ieee80211 wk->state =IEEE80211_MGD_STATE_ASSOC ; wk->tries =0 ; + wk->timeout = jiffies;/* run right away */ if (req->use_mfp) { ifmgd->mfp =IEEE80211_MFP_REQUIRED ;
Johannes Berg
maintainerPATCH v2 1/1 mac80211: fix mlme timeouts
Subject: mac80211: fix mlme timeouts
When a new MLME work is created, its timeout is initialised to 0. This is wrong, it could then be thought of as having an actual timeout in the future (time_is_after_jiffies() can return true). Instead, it should be initialised to jiffies so that it will run right away as soon as the mlme work is executed.
---
the assignment on probe response is, at least, unnecessary.
net/mac80211/mlme.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/mlme.c +2 -0
@@ -2374,6 +2374,7 @@ int ieee80211_mgd_auth(struct ieee80211_ wk->state =IEEE80211_MGD_STATE_PROBE ; wk->auth_alg = auth_alg; + wk->timeout = jiffies;/* run right away */ /* * XXX: if still associated need to tell AP that we're going
@@ -2445,6 +2446,7 @@ int ieee80211_mgd_assoc(struct ieee80211 wk->state =IEEE80211_MGD_STATE_ASSOC ; wk->tries =0 ; + wk->timeout = jiffies;/* run right away */ if (req->use_mfp) { ifmgd->mfp =IEEE80211_MFP_REQUIRED ;