Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ef24b2 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Move driver specific structures 



A bunch of data structures are present in the
common module, which are internal to ath9k.
Move them to ath9k.h

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d435700f

drivers/net/wireless/ath/ath9k/ath9k.h

+63 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,69 @@ struct ath_txq { 
	u8 txq_tailidx;

	u8 txq_tailidx;

};

};





struct ath_atx_ac {

	int sched;

	int qnum;

	struct list_head list;

	struct list_head tid_q;

};



struct ath_buf_state {

	int bfs_nframes;

	u16 bfs_al;

	u16 bfs_frmlen;

	int bfs_seqno;

	int bfs_tidno;

	int bfs_retries;

	u8 bf_type;

	u32 bfs_keyix;

	enum ath9k_key_type bfs_keytype;

};



struct ath_buf {

	struct list_head list;

	struct ath_buf *bf_lastbf;	/* last buf of this unit (a frame or

					   an aggregate) */

	struct ath_buf *bf_next;	/* next subframe in the aggregate */

	struct sk_buff *bf_mpdu;	/* enclosing frame structure */

	void *bf_desc;			/* virtual addr of desc */

	dma_addr_t bf_daddr;		/* physical addr of desc */

	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */

	bool bf_stale;

	bool bf_isnullfunc;

	bool bf_tx_aborted;

	u16 bf_flags;

	struct ath_buf_state bf_state;

	dma_addr_t bf_dmacontext;

	struct ath_wiphy *aphy;

};



struct ath_atx_tid {

	struct list_head list;

	struct list_head buf_q;

	struct ath_node *an;

	struct ath_atx_ac *ac;

	struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];

	u16 seq_start;

	u16 seq_next;

	u16 baw_size;

	int tidno;

	int baw_head;   /* first un-acked tx buffer */

	int baw_tail;   /* next unused tx buffer slot */

	int sched;

	int paused;

	u8 state;

};



struct ath_node {

	struct ath_common *common;

	struct ath_atx_tid tid[WME_NUM_TID];

	struct ath_atx_ac ac[WME_NUM_AC];

	u16 maxampdu;

	u8 mpdudensity;

	int last_rssi;

};



#define AGGR_CLEANUP         BIT(1)

#define AGGR_CLEANUP         BIT(1)

#define AGGR_ADDBA_COMPLETE  BIT(2)

#define AGGR_ADDBA_COMPLETE  BIT(2)

#define AGGR_ADDBA_PROGRESS  BIT(3)

#define AGGR_ADDBA_PROGRESS  BIT(3)

drivers/net/wireless/ath/ath9k/common.h

+0 −63
Original line number Original line Diff line number Diff line
@@ -52,69 +52,6 @@ 
#define ATH_EP_RND(x, mul) 						\

#define ATH_EP_RND(x, mul) 						\

	((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))

	((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))





struct ath_atx_ac {

	int sched;

	int qnum;

	struct list_head list;

	struct list_head tid_q;

};



struct ath_buf_state {

	int bfs_nframes;

	u16 bfs_al;

	u16 bfs_frmlen;

	int bfs_seqno;

	int bfs_tidno;

	int bfs_retries;

	u8 bf_type;

	u32 bfs_keyix;

	enum ath9k_key_type bfs_keytype;

};



struct ath_buf {

	struct list_head list;

	struct ath_buf *bf_lastbf;	/* last buf of this unit (a frame or

					   an aggregate) */

	struct ath_buf *bf_next;	/* next subframe in the aggregate */

	struct sk_buff *bf_mpdu;	/* enclosing frame structure */

	void *bf_desc;			/* virtual addr of desc */

	dma_addr_t bf_daddr;		/* physical addr of desc */

	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */

	bool bf_stale;

	bool bf_isnullfunc;

	bool bf_tx_aborted;

	u16 bf_flags;

	struct ath_buf_state bf_state;

	dma_addr_t bf_dmacontext;

	struct ath_wiphy *aphy;

};



struct ath_atx_tid {

	struct list_head list;

	struct list_head buf_q;

	struct ath_node *an;

	struct ath_atx_ac *ac;

	struct ath_buf *tx_buf[ATH_TID_MAX_BUFS];

	u16 seq_start;

	u16 seq_next;

	u16 baw_size;

	int tidno;

	int baw_head;   /* first un-acked tx buffer */

	int baw_tail;   /* next unused tx buffer slot */

	int sched;

	int paused;

	u8 state;

};



struct ath_node {

	struct ath_common *common;

	struct ath_atx_tid tid[WME_NUM_TID];

	struct ath_atx_ac ac[WME_NUM_AC];

	u16 maxampdu;

	u8 mpdudensity;

	int last_rssi;

};



int ath9k_cmn_padpos(__le16 frame_control);

int ath9k_cmn_padpos(__le16 frame_control);

int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,

void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,