Commit 272a9e2614bf3b93f47f95ef9507d4ceec6bec27
Committed by
Johannes Berg
1 parent
58506eba78
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
mac80211: mesh_plink: don't ignore holding timer
The ignore_plink_timer flag is set when doing mod_timer() if the timer was not previously active. This is to avoid executing the timeout if del_timer() was subsequently called. However, del_timer() only happens if we are moving to ESTAB state or get a close frame while in HOLDING. We cannot leave HOLDING and re-enter ESTAB unless we receive a close frame (in which case ignore_plink_timer is already set) or if the timeout expires, so there actually isn't a case where this is needed on mod_timer(). Signed-off-by: Bob Copeland <bob@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff
net/mac80211/mesh_plink.c
... | ... | @@ -671,8 +671,7 @@ |
671 | 671 | |
672 | 672 | sta->reason = reason; |
673 | 673 | sta->plink_state = NL80211_PLINK_HOLDING; |
674 | - if (!mod_plink_timer(sta, mshcfg->dot11MeshHoldingTimeout)) | |
675 | - sta->ignore_plink_timer = true; | |
674 | + mod_plink_timer(sta, mshcfg->dot11MeshHoldingTimeout); | |
676 | 675 | } |
677 | 676 | |
678 | 677 | static u32 mesh_plink_establish(struct ieee80211_sub_if_data *sdata, |