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

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

ath9k: Avoid unneeded casts 



Change the void pointer to struct sk_buff and access
bf_mpdu directly, removing all casts in the process.

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

drivers/net/wireless/ath9k/ath9k.h

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

	void *bf_mpdu;			/* enclosing frame structure */

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

	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 */

drivers/net/wireless/ath9k/beacon.c

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int ath_beaconq_config(struct ath_softc *sc) 
static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,

			     struct ath_buf *bf)

{

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

	struct sk_buff *skb = bf->bf_mpdu;

	struct ath_hw *ah = sc->sc_ah;

	struct ath_desc *ds;

	struct ath9k_11n_rate_series series[4];
@@ -138,7 +138,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, 
	/* Release the old beacon first */



	bf = avp->av_bcbuf;

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

	skb = bf->bf_mpdu;

	if (skb) {

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

				 skb->len, DMA_TO_DEVICE);
@@ -226,7 +226,7 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, 
		return;



	bf = avp->av_bcbuf;

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

	skb = bf->bf_mpdu;



	ath_beacon_setup(sc, avp, bf);
@@ -299,7 +299,7 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) 
	/* release the previous beacon frame, if it already exists. */

	bf = avp->av_bcbuf;

	if (bf->bf_mpdu != NULL) {

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

		skb = bf->bf_mpdu;

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

				 skb->len, DMA_TO_DEVICE);

		dev_kfree_skb_any(skb);
@@ -371,7 +371,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 = (struct sk_buff *)bf->bf_mpdu;

			struct sk_buff *skb = bf->bf_mpdu;

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

					 skb->len, DMA_TO_DEVICE);

			dev_kfree_skb_any(skb);

drivers/net/wireless/ath9k/xmit.c

+5 −5
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
	int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;

	bool rc_update = true;



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

	skb = bf->bf_mpdu;

	hdr = (struct ieee80211_hdr *)skb->data;



	rcu_read_lock();
@@ -444,7 +444,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, 
	u16 aggr_limit, legacy = 0, maxampdu;

	int i;



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

	skb = bf->bf_mpdu;

	tx_info = IEEE80211_SKB_CB(skb);

	rates = tx_info->control.rates;

	tx_info_priv = (struct ath_tx_info_priv *)tx_info->rate_driver_data[0];
@@ -1452,7 +1452,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf) 


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



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

	skb = bf->bf_mpdu;

	tx_info = IEEE80211_SKB_CB(skb);

	rates = tx_info->control.rates;

	hdr = (struct ieee80211_hdr *)skb->data;
@@ -1586,7 +1586,7 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, 
static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,

			     struct ath_tx_control *txctl)

{

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

	struct sk_buff *skb = bf->bf_mpdu;

	struct ieee80211_tx_info *tx_info =  IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ath_node *an = NULL;
@@ -1860,7 +1860,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf, 
static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds,

			     int nbad, int txok, bool update_rc)

{

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

	struct sk_buff *skb = bf->bf_mpdu;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);