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

Commit 272a9e26 authored by Bob Copeland's avatar Bob Copeland Committed by Johannes Berg
Browse files

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: default avatarBob Copeland <bob@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 58506eba

net/mac80211/mesh_plink.c

+1 −2
Original line number Diff line number Diff line
@@ -671,8 +671,7 @@ static void mesh_plink_close(struct ieee80211_sub_if_data *sdata, 


	sta->reason = reason;

	sta->plink_state = NL80211_PLINK_HOLDING;

	if (!mod_plink_timer(sta, mshcfg->dot11MeshHoldingTimeout))

		sta->ignore_plink_timer = true;

	mod_plink_timer(sta, mshcfg->dot11MeshHoldingTimeout);

}



static u32 mesh_plink_establish(struct ieee80211_sub_if_data *sdata,