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

Commit 528f0c6b authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Revamp transmit control block 



Use the ath_buf instance associated with each tx frame
directly and remove all redundant information in ath_tx_control.

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

drivers/net/wireless/ath9k/beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void ath_beacon_setup(struct ath_softc *sc, 
	ath9k_hw_set11n_txdesc(ah, ds,

			       skb->len + FCS_LEN,     /* frame length */

			       ATH9K_PKT_TYPE_BEACON,  /* Atheros packet type */

			       avp->av_btxctl.txpower, /* txpower XXX */

			       MAX_RATE_POWER,         /* FIXME */

			       ATH9K_TXKEYIX_INVALID,  /* no encryption */

			       ATH9K_KEY_TYPE_CLEAR,   /* no encryption */

			       flags                   /* no ack,

drivers/net/wireless/ath9k/core.h

+7 −23
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ struct ath_node; 
#define TSF_TO_TU(_h,_l) \

	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))



#define ATH9K_BH_STATUS_INTACT		0

#define ATH9K_BH_STATUS_CHANGE		1



#define	ATH_TXQ_SETUP(sc, i)        ((sc)->sc_txqsetup & (1<<i))



static inline unsigned long get_timestamp(void)
@@ -209,6 +206,7 @@ struct ath_buf_state { 
	struct ath_rc_series bfs_rcs[4];	/* rate series */

	u32 bf_type;				/* BUF_* (enum buffer_type) */

	/* key type use to encrypt this frame */

	u32 bfs_keyix;

	enum ath9k_key_type bfs_keytype;

};
@@ -219,6 +217,7 @@ struct ath_buf_state { 
#define bf_seqno        	bf_state.bfs_seqno

#define bf_tidno        	bf_state.bfs_tidno

#define bf_rcs          	bf_state.bfs_rcs

#define bf_keyix                bf_state.bfs_keyix

#define bf_keytype      	bf_state.bfs_keytype

#define bf_isdata(bf)		(bf->bf_state.bf_type & BUF_DATA)

#define bf_isaggr(bf)		(bf->bf_state.bf_type & BUF_AGGR)
@@ -244,7 +243,6 @@ struct ath_buf { 
	struct ath_buf *bf_next;	/* next subframe in the aggregate */

	struct ath_buf *bf_rifslast;	/* last buf for RIFS burst */

	void *bf_mpdu;			/* enclosing frame structure */

	void *bf_node;			/* pointer to the node */

	struct ath_desc *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 */
@@ -493,24 +491,8 @@ struct ath_atx { 


/* per-frame tx control block */

struct ath_tx_control {

	struct ath_node *an;

	struct ath_txq *txq;

	int if_id;

	int qnum;

	u32 ht:1;

	u32 ps:1;

	u32 use_minrate:1;

	enum ath9k_pkt_type atype;

	enum ath9k_key_type keytype;

	u32 flags;

	u16 seqno;

	u16 tidno;

	u16 txpower;

	u16 frmlen;

	u32 keyix;

	int min_rate;

	int mcast_rate;

	struct ath_softc *dev;

	dma_addr_t dmacontext;

};



/* per frame tx status block */
@@ -551,15 +533,17 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq); 
int ath_tx_init(struct ath_softc *sc, int nbufs);

int ath_tx_cleanup(struct ath_softc *sc);

int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);

struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb);

int ath_txq_update(struct ath_softc *sc, int qnum,

		   struct ath9k_tx_queue_info *q);

int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb);

int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb,

		 struct ath_tx_control *txctl);

void ath_tx_tasklet(struct ath_softc *sc);

u32 ath_txq_depth(struct ath_softc *sc, int qnum);

u32 ath_txq_aggr_depth(struct ath_softc *sc, int qnum);

void ath_notify_txq_status(struct ath_softc *sc, u16 queue_depth);

void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,

		     struct ath_xmit_status *tx_status, struct ath_node *an);

		     struct ath_xmit_status *tx_status);

void ath_tx_cabq(struct ath_softc *sc, struct sk_buff *skb);



/**********************/

drivers/net/wireless/ath9k/main.c

+17 −6
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ void ath_get_beaconconfig(struct ath_softc *sc, 
}



void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,

		     struct ath_xmit_status *tx_status, struct ath_node *an)

		     struct ath_xmit_status *tx_status)

{

	struct ieee80211_hw *hw = sc->hw;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -906,6 +906,7 @@ static int ath_attach(u16 devid, 
	}



	hw->queues = 4;

	hw->sta_data_size = sizeof(struct ath_node);



	/* Register rate control */

	hw->rate_control_algorithm = "ath9k_rate_control";
@@ -1016,9 +1017,12 @@ static int ath9k_start(struct ieee80211_hw *hw) 
static int ath9k_tx(struct ieee80211_hw *hw,

		    struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ath_softc *sc = hw->priv;

	struct ath_tx_control txctl;

	int hdrlen, padsize;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	memset(&txctl, 0, sizeof(struct ath_tx_control));



	/*

	 * As a temporary workaround, assign seq# here; this will likely need
@@ -1043,17 +1047,24 @@ static int ath9k_tx(struct ieee80211_hw *hw, 
		memmove(skb->data, skb->data + padsize, hdrlen);

	}



	/* Check if a tx queue is available */



	txctl.txq = ath_test_get_txq(sc, skb);

	if (!txctl.txq)

		goto exit;



	DPRINTF(sc, ATH_DBG_XMIT, "%s: transmitting packet, skb: %p\n",

		__func__,

		skb);



	if (ath_tx_start(sc, skb) != 0) {

	if (ath_tx_start(sc, skb, &txctl) != 0) {

		DPRINTF(sc, ATH_DBG_XMIT, "%s: TX failed\n", __func__);

		dev_kfree_skb_any(skb);

		/* FIXME: Check for proper return value from ATH_DEV */

		return 0;

		goto exit;

	}



	return 0;

exit:

	dev_kfree_skb_any(skb);

	return 0;

}

drivers/net/wireless/ath9k/xmit.c

+299 −312

File changed.

Preview size limit exceeded, changes collapsed.