iwlwifi: fix canceling monitor_recover timer
authorStanislaw Gruszka <sgruszka@redhat.com>
Fri, 20 Aug 2010 13:23:47 +0000 (15:23 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Aug 2010 18:33:16 +0000 (14:33 -0400)
commitb62177a0aa0521fd07cd7501534c0c3b256ebce6
tree09969b36f8ebd4e93ddd2f5598094f699254957c
parent268bae0b6879f238ba57f5f801958d1254e136f7
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 <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c