diff options
Diffstat (limited to 'drivers/staging/ath6kl/reorder/rcv_aggr.c')
| -rw-r--r-- | drivers/staging/ath6kl/reorder/rcv_aggr.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c index 094b227b32c4..9b1509ec5a7b 100644 --- a/drivers/staging/ath6kl/reorder/rcv_aggr.c +++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c @@ -21,11 +21,8 @@ * */ -#ifdef ATH_AR6K_11N_SUPPORT - #include <a_config.h> #include <athdefs.h> -#include <a_types.h> #include <a_osapi.h> #include <a_debug.h> #include "pkt_log.h" @@ -40,7 +37,7 @@ static void aggr_slice_amsdu(struct aggr_info *p_aggr, struct rxtid *rxtid, void **osbuf); static void -aggr_timeout(A_ATH_TIMER arg); +aggr_timeout(unsigned long arg); static void aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order); @@ -123,7 +120,7 @@ aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid) rxtid->hold_q_sz = 0; if(rxtid->hold_q) { - A_FREE(rxtid->hold_q); + kfree(rxtid->hold_q); rxtid->hold_q = NULL; } @@ -154,7 +151,7 @@ aggr_module_destroy(void *cntxt) A_NETBUF_FREE(rxtid->hold_q[k].osbuf); } } - A_FREE(rxtid->hold_q); + kfree(rxtid->hold_q); } /* Free the dispatch q contents*/ while(A_NETBUF_QUEUE_SIZE(&rxtid->q)) { @@ -168,7 +165,7 @@ aggr_module_destroy(void *cntxt) while(A_NETBUF_QUEUE_SIZE(&p_aggr->freeQ)) { A_NETBUF_FREE(A_NETBUF_DEQUEUE(&p_aggr->freeQ)); } - A_FREE(p_aggr); + kfree(p_aggr); } A_PRINTF("out aggr_module_destroy\n"); } @@ -573,7 +570,7 @@ aggr_reset_state(void *cntxt) static void -aggr_timeout(A_ATH_TIMER arg) +aggr_timeout(unsigned long arg) { u8 i,j; struct aggr_info *p_aggr = (struct aggr_info *)arg; @@ -662,5 +659,3 @@ aggr_dump_stats(void *cntxt, PACKET_LOG **log_buf) A_PRINTF("================================================\n\n"); } - -#endif /* ATH_AR6K_11N_SUPPORT */ |