From cd26c4223b3d7c20fdfd7684fcd99a021c3ded91 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Sat, 21 Jan 2012 15:22:48 +0530 Subject: [PATCH] --- yaml --- r: 290273 b: refs/heads/master c: 7a950ea81de6cbf96e721599bfacdb409908cd00 h: refs/heads/master i: 290271: a71fbcf45c6ae2dd84efc5c2fd3b9cb6eb4d6c1f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/txrx.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3be0774db801..d5701612b0d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 241b128b6b69ad41fc6f12cba45a3c3e64bce673 +refs/heads/master: 7a950ea81de6cbf96e721599bfacdb409908cd00 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c index dd6337142603..cb7421a31619 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/trunk/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); }