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

Commit 8f93b8b3 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Use straightforward PCI routines to setup the TX buffer. 



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

drivers/net/wireless/ath9k/xmit.c

+7 −16
Original line number Original line Diff line number Diff line
@@ -1646,7 +1646,7 @@ static void ath_txq_drain_pending_buffers(struct ath_softc *sc, 
}

}





static void ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,

static void ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf,

				struct sk_buff *skb, struct scatterlist *sg,

				struct sk_buff *skb,

				struct ath_tx_control *txctl)

				struct ath_tx_control *txctl)

{

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -1711,7 +1711,6 @@ static void ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf, 




/* FIXME: tx power */

/* FIXME: tx power */

static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,

static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,

			     struct scatterlist *sg, u32 n_sg,

			     struct ath_tx_control *txctl)

			     struct ath_tx_control *txctl)

{

{

	struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu;

	struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu;
@@ -1740,9 +1739,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
			       bf->bf_keyix, bf->bf_keytype, bf->bf_flags);

			       bf->bf_keyix, bf->bf_keytype, bf->bf_flags);





	ath9k_hw_filltxdesc(ah, ds,

	ath9k_hw_filltxdesc(ah, ds,

			    sg_dma_len(sg),		/* segment length */

			    skb->len,	/* segment length */

			    true,	/* first segment */

			    true,	/* first segment */

			    (n_sg == 1) ? true : false,	/* last segment */

			    true,	/* last segment */

			    ds);	/* first descriptor */

			    ds);	/* first descriptor */





	bf->bf_lastfrm = bf;

	bf->bf_lastfrm = bf;
@@ -1783,7 +1782,6 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb, 
		 struct ath_tx_control *txctl)

		 struct ath_tx_control *txctl)

{

{

	struct ath_buf *bf;

	struct ath_buf *bf;

	struct scatterlist sg;





	/* Check if a tx buffer is available */

	/* Check if a tx buffer is available */
@@ -1794,15 +1792,8 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb, 
		return -1;

		return -1;

	}

	}





	ath_tx_setup_buffer(sc, bf, skb, &sg, txctl);

	ath_tx_setup_buffer(sc, bf, skb, txctl);



	ath_tx_start_dma(sc, bf, txctl);

	/* Setup S/G */



	memset(&sg, 0, sizeof(struct scatterlist));

	sg_dma_address(&sg) = bf->bf_dmacontext;

	sg_dma_len(&sg) = skb->len;



	ath_tx_start_dma(sc, bf, &sg, 1, txctl);





	return 0;

	return 0;

}

}