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

Commit c1739eb3 authored by Ben Greear's avatar Ben Greear Committed by John W. Linville
Browse files

ath9k: Remove bf_dmacontext. 



The bf_dmacontext seems to be totally useless and duplicated
by bf_buf_addr.  Remove it entirely, use bf_buf_addr in its
place.

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5161bec5

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

+1 −2
Original line number Diff line number Diff line
@@ -239,12 +239,11 @@ struct ath_buf { 
	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 */

	dma_addr_t bf_buf_addr;	/* physical addr of data buffer, for DMA */

	bool bf_stale;

	bool bf_tx_aborted;

	u16 bf_flags;

	struct ath_buf_state bf_state;

	dma_addr_t bf_dmacontext;

	struct ath_wiphy *aphy;

};

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

+7 −9
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, 
	bf = avp->av_bcbuf;

	skb = bf->bf_mpdu;

	if (skb) {

		dma_unmap_single(sc->dev, bf->bf_dmacontext,

		dma_unmap_single(sc->dev, bf->bf_buf_addr,

				 skb->len, DMA_TO_DEVICE);

		dev_kfree_skb_any(skb);

	}
@@ -162,8 +162,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, 
		hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);

	}



	bf->bf_buf_addr = bf->bf_dmacontext =

		dma_map_single(sc->dev, skb->data,

	bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,

					 skb->len, DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {

		dev_kfree_skb_any(skb);
@@ -252,7 +251,7 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) 
	bf = avp->av_bcbuf;

	if (bf->bf_mpdu != NULL) {

		skb = bf->bf_mpdu;

		dma_unmap_single(sc->dev, bf->bf_dmacontext,

		dma_unmap_single(sc->dev, bf->bf_buf_addr,

				 skb->len, DMA_TO_DEVICE);

		dev_kfree_skb_any(skb);

		bf->bf_mpdu = NULL;
@@ -296,8 +295,7 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) 
		avp->tsf_adjust = cpu_to_le64(0);



	bf->bf_mpdu = skb;

	bf->bf_buf_addr = bf->bf_dmacontext =

		dma_map_single(sc->dev, skb->data,

	bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,

					 skb->len, DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {

		dev_kfree_skb_any(skb);
@@ -324,7 +322,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp) 
		bf = avp->av_bcbuf;

		if (bf->bf_mpdu != NULL) {

			struct sk_buff *skb = bf->bf_mpdu;

			dma_unmap_single(sc->dev, bf->bf_dmacontext,

			dma_unmap_single(sc->dev, bf->bf_buf_addr,

					 skb->len, DMA_TO_DEVICE);

			dev_kfree_skb_any(skb);

			bf->bf_mpdu = NULL;

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

+0 −2
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ int ath_rx_init(struct ath_softc *sc, int nbufs) 
				error = -ENOMEM;

				goto err;

			}

			bf->bf_dmacontext = bf->bf_buf_addr;

		}

		sc->rx.rxlink = NULL;

	}
@@ -1739,7 +1738,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) 
			ath_rx_send_to_mac80211(hw, sc, skb, rxs);

			break;

		}

		bf->bf_dmacontext = bf->bf_buf_addr;



		/*

		 * change the default rx antenna if rx diversity chooses the

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

+4 −7
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf) 
	tbf->bf_buf_addr = bf->bf_buf_addr;

	memcpy(tbf->bf_desc, bf->bf_desc, sc->sc_ah->caps.tx_desc_len);

	tbf->bf_state = bf->bf_state;

	tbf->bf_dmacontext = bf->bf_dmacontext;



	return tbf;

}
@@ -1640,17 +1639,15 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, 


	bf->bf_mpdu = skb;



	bf->bf_dmacontext = dma_map_single(sc->dev, skb->data,

	bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,

					 skb->len, DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(sc->dev, bf->bf_dmacontext))) {

	if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {

		bf->bf_mpdu = NULL;

		ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,

			  "dma_mapping_error() on TX\n");

		return -ENOMEM;

	}



	bf->bf_buf_addr = bf->bf_dmacontext;



	bf->bf_tx_aborted = false;



	return 0;
@@ -1914,7 +1911,7 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf, 
			tx_flags |= ATH_TX_XRETRY;

	}



	dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);

	dma_unmap_single(sc->dev, bf->bf_buf_addr, skb->len, DMA_TO_DEVICE);



	if (bf->bf_state.bfs_paprd) {

		if (time_after(jiffies,