From 9da9daf274002d240f5b72dd4d2e18e1f629ac26 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 14 Mar 2011 10:59:07 -0700 Subject: [PATCH] ath6kl: remove-typedef RXTID_STATS remove-typedef -s RXTID_STATS \ "struct rxtid_stats" drivers/staging/ath6kl/ Tested-by: Naveen Singh Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman --- .../staging/ath6kl/reorder/aggr_rx_internal.h | 6 +++--- drivers/staging/ath6kl/reorder/rcv_aggr.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h index 8b091dfb9cf..becbab9a8d8 100644 --- a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h +++ b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h @@ -88,7 +88,7 @@ struct rxtid { A_MUTEX_T lock; }; -typedef struct { +struct rxtid_stats { u32 num_into_aggr; /* hitting at the input of this module */ u32 num_dups; /* duplicate */ u32 num_oow; /* out of window */ @@ -98,7 +98,7 @@ typedef struct { u32 num_timeouts; /* num of timeouts, during which frames delivered */ u32 num_hole; /* frame not present, when window moved over */ u32 num_bar; /* num of resets of seq_num, via BAR */ -}RXTID_STATS; +}; struct aggr_info { u8 aggr_sz; /* config value of aggregation size */ @@ -109,7 +109,7 @@ struct aggr_info { struct rxtid RxTid[NUM_OF_TIDS]; /* Per tid window */ ALLOC_NETBUFS netbuf_allocator; /* OS netbuf alloc fn */ A_NETBUF_QUEUE_T freeQ; /* pre-allocated buffers - for A_MSDU slicing */ - RXTID_STATS stat[NUM_OF_TIDS]; /* Tid based statistics */ + struct rxtid_stats stat[NUM_OF_TIDS]; /* Tid based statistics */ PACKET_LOG pkt_log; /* Log info of the packets */ }; diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c index 8d134898e4c..094b227b32c 100644 --- a/drivers/staging/ath6kl/reorder/rcv_aggr.c +++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c @@ -104,7 +104,7 @@ static void aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid) { struct rxtid *rxtid; - RXTID_STATS *stats; + struct rxtid_stats *stats; A_ASSERT(tid < NUM_OF_TIDS && p_aggr); @@ -127,7 +127,7 @@ aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid) rxtid->hold_q = NULL; } - A_MEMZERO(stats, sizeof(RXTID_STATS)); + A_MEMZERO(stats, sizeof(struct rxtid_stats)); } void @@ -190,7 +190,7 @@ void aggr_process_bar(void *cntxt, u8 tid, u16 seq_no) { struct aggr_info *p_aggr = (struct aggr_info *)cntxt; - RXTID_STATS *stats; + struct rxtid_stats *stats; A_ASSERT(p_aggr); stats = AGGR_GET_RXTID_STATS(p_aggr, tid); @@ -205,7 +205,7 @@ aggr_recv_addba_req_evt(void *cntxt, u8 tid, u16 seq_no, u8 win_sz) { struct aggr_info *p_aggr = (struct aggr_info *)cntxt; struct rxtid *rxtid; - RXTID_STATS *stats; + struct rxtid_stats *stats; A_ASSERT(p_aggr); rxtid = AGGR_GET_RXTID(p_aggr, tid); @@ -274,7 +274,7 @@ aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order) struct rxtid *rxtid; struct osbuf_hold_q *node; u16 idx, idx_end, seq_end; - RXTID_STATS *stats; + struct rxtid_stats *stats; A_ASSERT(p_aggr); rxtid = AGGR_GET_RXTID(p_aggr, tid); @@ -430,7 +430,7 @@ aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osb { struct aggr_info *p_aggr = (struct aggr_info *)cntxt; struct rxtid *rxtid; - RXTID_STATS *stats; + struct rxtid_stats *stats; u16 idx, st, cur, end; u16 *log_idx; struct osbuf_hold_q *node; @@ -578,7 +578,7 @@ aggr_timeout(A_ATH_TIMER arg) u8 i,j; struct aggr_info *p_aggr = (struct aggr_info *)arg; struct rxtid *rxtid; - RXTID_STATS *stats; + struct rxtid_stats *stats; /* * If the q for which the timer was originally started has * not progressed then it is necessary to dequeue all the @@ -644,7 +644,7 @@ aggr_dump_stats(void *cntxt, PACKET_LOG **log_buf) { struct aggr_info *p_aggr = (struct aggr_info *)cntxt; struct rxtid *rxtid; - RXTID_STATS *stats; + struct rxtid_stats *stats; u8 i; *log_buf = &p_aggr->pkt_log; -- 2.39.2