diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2012-01-21 04:52:48 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-24 07:12:26 -0500 |
commit | 7a950ea81de6cbf96e721599bfacdb409908cd00 (patch) | |
tree | 16651c5e53d5720390fbce2a9119cc1fe894ac27 /drivers/net/wireless | |
parent | 241b128b6b69ad41fc6f12cba45a3c3e64bce673 (diff) |
ath6kl: Make sure to delete rx aggregation timer in aggr_reset_state()
The timer which is used to flush rx aggregation frames needs to
be disabled when resetting the aggregation state. This is found
in code review.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/txrx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index dd6337142603..cb7421a31619 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c | |||
@@ -1685,6 +1685,11 @@ void aggr_reset_state(struct aggr_info *aggr_info) | |||
1685 | { | 1685 | { |
1686 | u8 tid; | 1686 | u8 tid; |
1687 | 1687 | ||
1688 | if (aggr_info->timer_scheduled) { | ||
1689 | del_timer(&aggr_info->timer); | ||
1690 | aggr_info->timer_scheduled = false; | ||
1691 | } | ||
1692 | |||
1688 | for (tid = 0; tid < NUM_OF_TIDS; tid++) | 1693 | for (tid = 0; tid < NUM_OF_TIDS; tid++) |
1689 | aggr_delete_tid_state(aggr_info, tid); | 1694 | aggr_delete_tid_state(aggr_info, tid); |
1690 | } | 1695 | } |