ath6kl: Make sure to delete rx aggregation timer in aggr_reset_state()
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Sat, 21 Jan 2012 09:52:48 +0000 (15:22 +0530)
committerKalle Valo <kvalo@qca.qualcomm.com>
Tue, 24 Jan 2012 12:12:26 +0000 (14:12 +0200)
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>
drivers/net/wireless/ath/ath6kl/txrx.c

index dd6337142603163776e55606a0bb4eef60fe87d7..cb7421a316199cf672d325637ed1ed298cbbf8b5 100644 (file)
@@ -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);
 }