From: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Date: Sat, 21 Jan 2012 09:52:48 +0000 (+0530)
Subject: ath6kl: Make sure to delete rx aggregation timer in aggr_reset_state()
X-Git-Tag: v3.4-rc1~177^2~48^2~55^2~66
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a950ea81de6cbf96e721599bfacdb409908cd00;p=platform%2Fkernel%2Flinux-exynos.git

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>
---

diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index dd63371..cb7421a 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)
 {
 	u8 tid;
 
+	if (aggr_info->timer_scheduled) {
+		del_timer(&aggr_info->timer);
+		aggr_info->timer_scheduled = false;
+	}
+
 	for (tid = 0; tid < NUM_OF_TIDS; tid++)
 		aggr_delete_tid_state(aggr_info, tid);
 }