Skip to content

Commit

Permalink
ath6kl: remove-typedef OSBUF_HOLD_Q
Browse files Browse the repository at this point in the history
remove-typedef -s OSBUF_HOLD_Q \
	"struct osbuf_hold_q" drivers/staging/ath6kl/

Tested-by: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent fc5f362 commit 6286085
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/ath6kl/reorder/aggr_rx_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/ath6kl/reorder/rcv_aggr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 6286085

Please sign in to comment.