[PATCH 918/961] ath6kl: remove-typedef OSBUF_HOLD_Q
Greg Kroah-Hartman
gregkh at suse.de
Wed Mar 16 21:09:21 UTC 2011
From: Luis R. Rodriguez <lrodriguez at atheros.com>
remove-typedef -s OSBUF_HOLD_Q \
"struct osbuf_hold_q" drivers/staging/ath6kl/
Tested-by: Naveen Singh <nsingh at atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 8 ++++----
drivers/staging/ath6kl/reorder/rcv_aggr.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
index 20c894d..082a8da 100644
--- a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+++ b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
@@ -48,7 +48,7 @@
#define AGGR_GET_RXTID(_p, _x) (&(_p->RxTid[(_x)]))
/* Hold q is a function of win_sz, which is negotiated per tid */
-#define HOLD_Q_SZ(_x) (TID_WINDOW_SZ((_x))*sizeof(OSBUF_HOLD_Q))
+#define HOLD_Q_SZ(_x) (TID_WINDOW_SZ((_x))*sizeof(struct osbuf_hold_q))
/* AGGR_RX_TIMEOUT value is important as a (too) small value can cause frames to be
* delivered out of order and a (too) large value can cause undesirable latency in
* certain situations. */
@@ -59,11 +59,11 @@ typedef enum {
CONTIGUOUS_SEQNO = 1,
}DELIVERY_ORDER;
-typedef struct {
+struct osbuf_hold_q {
void *osbuf;
bool is_amsdu;
u16 seq_no;
-}OSBUF_HOLD_Q;
+};
#if 0
@@ -80,7 +80,7 @@ typedef struct {
u16 win_sz; /* negotiated window size */
u16 seq_next; /* Next seq no, in current window */
u32 hold_q_sz; /* Num of frames that can be held in hold q */
- OSBUF_HOLD_Q *hold_q; /* Hold q for re-order */
+ struct osbuf_hold_q *hold_q; /* Hold q for re-order */
#if 0
WINDOW_SNAPSHOT old_win; /* Sliding window snapshot - for timeout */
#endif
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c
index 8beb00d..c54d492 100644
--- a/drivers/staging/ath6kl/reorder/rcv_aggr.c
+++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c
@@ -272,7 +272,7 @@ static void
aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order)
{
RXTID *rxtid;
- OSBUF_HOLD_Q *node;
+ struct osbuf_hold_q *node;
u16 idx, idx_end, seq_end;
RXTID_STATS *stats;
@@ -433,7 +433,7 @@ aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osb
RXTID_STATS *stats;
u16 idx, st, cur, end;
u16 *log_idx;
- OSBUF_HOLD_Q *node;
+ struct osbuf_hold_q *node;
PACKET_LOG *log;
A_ASSERT(p_aggr);
--
1.7.4.1
More information about the devel
mailing list