diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-08-20 15:23:47 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 20:33:16 +0200 |
commit | b62177a0aa0521fd07cd7501534c0c3b256ebce6 (patch) | |
tree | 09969b36f8ebd4e93ddd2f5598094f699254957c /net/mac80211/rate.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-b62177a0aa0521fd07cd7501534c0c3b256ebce6.tar.xz linux-b62177a0aa0521fd07cd7501534c0c3b256ebce6.zip |
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>
Diffstat (limited to 'net/mac80211/rate.c')
0 files changed, 0 insertions, 0 deletions