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

Commit 3f3a1c80 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k_hw: Move code which populates ds_data to ath9k_hw 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 162c3be3

drivers/net/wireless/ath/ath9k/beacon.c

+1 −3
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, 
		antenna = ((sc->beacon.ast_be_xmit / sc->nbcnvifs) & 1 ? 2 : 1);

	}



	ds->ds_data = bf->bf_buf_addr;



	sband = &sc->sbands[common->hw->conf.channel->band];

	rate = sband->bitrates[rateidx].hw_value;

	if (sc->sc_flags & SC_OP_PREAMBLE_SHORT)
@@ -109,7 +107,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, 


	/* NB: beacon's BufLen must be a multiple of 4 bytes */

	ath9k_hw_filltxdesc(ah, ds, roundup(skb->len, 4),

			    true, true, ds);

			    true, true, ds, bf->bf_buf_addr);



	memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4);

	series[0].Tries = 1;

drivers/net/wireless/ath/ath9k/mac.c

+4 −1
Original line number Diff line number Diff line
@@ -220,10 +220,13 @@ EXPORT_SYMBOL(ath9k_hw_stoptxdma); 


void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds,

			 u32 segLen, bool firstSeg,

			 bool lastSeg, const struct ath_desc *ds0)

			 bool lastSeg, const struct ath_desc *ds0,

			 dma_addr_t buf_addr)

{

	struct ar5416_desc *ads = AR5416DESC(ds);



	ads->ds_data = buf_addr;



	if (firstSeg) {

		ads->ds_ctl1 |= segLen | (lastSeg ? 0 : AR_TxMore);

	} else if (lastSeg) {

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

+2 −1
Original line number Diff line number Diff line
@@ -693,7 +693,8 @@ bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); 
bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q);

void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds,

			 u32 segLen, bool firstSeg,

			 bool lastSeg, const struct ath_desc *ds0);

			 bool lastSeg, const struct ath_desc *ds0,

			 dma_addr_t buf_addr);

void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds);

int ath9k_hw_txprocdesc(struct ath_hw *ah, struct ath_desc *ds,

			struct ath_tx_status *ts);

drivers/net/wireless/ath/ath9k/xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -1660,7 +1660,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 


	ds = bf->bf_desc;

	ds->ds_link = 0;

	ds->ds_data = bf->bf_buf_addr;



	ath9k_hw_set11n_txdesc(ah, ds, bf->bf_frmlen, frm_type, MAX_RATE_POWER,

			       bf->bf_keyix, bf->bf_keytype, bf->bf_flags);
@@ -1669,7 +1668,8 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
			    skb->len,	/* segment length */

			    true,	/* first segment */

			    true,	/* last segment */

			    ds);	/* first descriptor */

			    ds,		/* first descriptor */

			    bf->bf_buf_addr);



	spin_lock_bh(&txctl->txq->axq_lock);