From: Akinobu Mita Date: Mon, 13 Oct 2008 09:35:05 +0000 (+0100) Subject: ip2: avoid add_timer with pending timer X-Git-Tag: v2.6.28-rc1~672 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d020a2e5fd2c79f5b08a6cab2b02e7231d7cb84;p=pandora-kernel.git ip2: avoid add_timer with pending timer add_timer() is not supposed to be called when the timer is pending. ip2 driver attempts to avoid that condition by setting and resetting a flag (TimerOn) in timer function. But there is some gap between add_timer() and setting TimerOn. This patch fix this problem by using mod_timer() and remove TimerOn which has been unnecessary by this change. Signed-off-by: Akinobu Mita Signed-off-by: Jiri Slaby Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed