On Wed, Jun 04, 2014 at 04:08:28PM +0200, Johannes Berg wrote: > On Wed, 2014-06-04 at 09:27 -0400, Bob Copeland wrote: > > However, using the mod_timer()/del_timer() return values to > > detect these cases is broken. As a result, timers get ignored > > unnecessarily, and stations can get stuck in the peering state > > machine. > > > > Instead, we can detect the case by looking at the timer expiration. > > In the case of del_timer, just ignore the timers in the following > > (LISTEN/ESTAB) states since they won't have timers anyway. > > I'm not entirely sure about the expiration thing - doesn't seem > different from the outside flag? But anyway - applied. Happy to be enlightened -- for what it's worth this is my reasoning: My understanding of mod_timer() return value is that it just means the timer was scheduled, not actually running, and the original code assumed the latter. So let's say the timer is already scheduled to happen 5 seconds from now, the old code would do: lock /* changing state, timer now reflects a different state timeout */ rv = mod_timer(10 secs from now); if (rv) /* timer was already scheduled */ ignore_plink_timer = 1; unlock So when the timer runs in 10 seconds it would skip execution even though the first handler hadn't executed yet. It got the race case right, but not the race-free case. -- Bob Copeland %% www.bobcopeland.com -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
