From: Bob Copeland Date: Tue, 5 Nov 2013 19:16:56 +0000 (-0800) Subject: mac80211: mesh_plink: don't ignore holding timer X-Git-Tag: v3.14-rc1~94^2~334^2^2~156 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=272a9e2614bf3b93f47f95ef9507d4ceec6bec27;p=pandora-kernel.git 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 Signed-off-by: Johannes Berg --- Reading git-diff-tree failed