From: Stanislaw Gruszka Date: Fri, 20 Aug 2010 13:23:47 +0000 (+0200) Subject: iwlwifi: fix canceling monitor_recover timer X-Git-Tag: v2.6.37-rc1~147^2~584^2^2~94 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62177a0aa0521fd07cd7501534c0c3b256ebce6;p=pandora-kernel.git iwlwifi: fix canceling monitor_recover timer To make del_timer_sync() works we have to assure that timer function does not rearm the timer. To achieve that we cancel timer with STATUS_EXIT_PENDING bit set in __iwl{3945,}_down function. Patch also fix priv->txq memory usage after free for iwl3945, because it move timer cancellation before iwl3945_hw_txq_ctx_free(priv) is called. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville --- Reading git-diff-tree failed