diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-03-30 05:58:36 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:32 -0400 |
commit | a22be22ab8fe571cce88d0d30b49f297a563c4a7 (patch) | |
tree | 626d81aa65679c2f6486f14e869ac8d5d544d368 | |
parent | 0ef1f168b6bc82b0b157c568e764b75961867970 (diff) |
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: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath9k/ath9k.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/beacon.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h index 1dfc3816a2d..9adc991cb05 100644 --- a/drivers/net/wireless/ath9k/ath9k.h +++ b/drivers/net/wireless/ath9k/ath9k.h | |||
@@ -130,7 +130,7 @@ struct ath_buf { | |||
130 | struct ath_buf *bf_lastbf; /* last buf of this unit (a frame or | 130 | struct ath_buf *bf_lastbf; /* last buf of this unit (a frame or |
131 | an aggregate) */ | 131 | an aggregate) */ |
132 | struct ath_buf *bf_next; /* next subframe in the aggregate */ | 132 | struct ath_buf *bf_next; /* next subframe in the aggregate */ |
133 | void *bf_mpdu; /* enclosing frame structure */ | 133 | struct sk_buff *bf_mpdu; /* enclosing frame structure */ |
134 | struct ath_desc *bf_desc; /* virtual addr of desc */ | 134 | struct ath_desc *bf_desc; /* virtual addr of desc */ |
135 | dma_addr_t bf_daddr; /* physical addr of desc */ | 135 | dma_addr_t bf_daddr; /* physical addr of desc */ |
136 | dma_addr_t bf_buf_addr; /* physical addr of data buffer */ | 136 | dma_addr_t bf_buf_addr; /* physical addr of data buffer */ |
diff --git a/drivers/net/wireless/ath9k/beacon.c b/drivers/net/wireless/ath9k/beacon.c index 5b2752b43be..eb4759fc6a0 100644 --- a/drivers/net/wireless/ath9k/beacon.c +++ b/drivers/net/wireless/ath9k/beacon.c | |||
@@ -59,7 +59,7 @@ static int ath_beaconq_config(struct ath_softc *sc) | |||
59 | static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, | 59 | static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp, |
60 | struct ath_buf *bf) | 60 | struct ath_buf *bf) |
61 | { | 61 | { |
62 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; | 62 | struct sk_buff *skb = bf->bf_mpdu; |
63 | struct ath_hw *ah = sc->sc_ah; | 63 | struct ath_hw *ah = sc->sc_ah; |
64 | struct ath_desc *ds; | 64 | struct ath_desc *ds; |
65 | struct ath9k_11n_rate_series series[4]; | 65 | struct ath9k_11n_rate_series series[4]; |
@@ -138,7 +138,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, | |||
138 | /* Release the old beacon first */ | 138 | /* Release the old beacon first */ |
139 | 139 | ||
140 | bf = avp->av_bcbuf; | 140 | bf = avp->av_bcbuf; |
141 | skb = (struct sk_buff *)bf->bf_mpdu; | 141 | skb = bf->bf_mpdu; |
142 | if (skb) { | 142 | if (skb) { |
143 | dma_unmap_single(sc->dev, bf->bf_dmacontext, | 143 | dma_unmap_single(sc->dev, bf->bf_dmacontext, |
144 | skb->len, DMA_TO_DEVICE); | 144 | skb->len, DMA_TO_DEVICE); |
@@ -226,7 +226,7 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, | |||
226 | return; | 226 | return; |
227 | 227 | ||
228 | bf = avp->av_bcbuf; | 228 | bf = avp->av_bcbuf; |
229 | skb = (struct sk_buff *) bf->bf_mpdu; | 229 | skb = bf->bf_mpdu; |
230 | 230 | ||
231 | ath_beacon_setup(sc, avp, bf); | 231 | ath_beacon_setup(sc, avp, bf); |
232 | 232 | ||
@@ -299,7 +299,7 @@ int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif) | |||
299 | /* release the previous beacon frame, if it already exists. */ | 299 | /* release the previous beacon frame, if it already exists. */ |
300 | bf = avp->av_bcbuf; | 300 | bf = avp->av_bcbuf; |
301 | if (bf->bf_mpdu != NULL) { | 301 | if (bf->bf_mpdu != NULL) { |
302 | skb = (struct sk_buff *)bf->bf_mpdu; | 302 | skb = bf->bf_mpdu; |
303 | dma_unmap_single(sc->dev, bf->bf_dmacontext, | 303 | dma_unmap_single(sc->dev, bf->bf_dmacontext, |
304 | skb->len, DMA_TO_DEVICE); | 304 | skb->len, DMA_TO_DEVICE); |
305 | dev_kfree_skb_any(skb); | 305 | dev_kfree_skb_any(skb); |
@@ -371,7 +371,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp) | |||
371 | 371 | ||
372 | bf = avp->av_bcbuf; | 372 | bf = avp->av_bcbuf; |
373 | if (bf->bf_mpdu != NULL) { | 373 | if (bf->bf_mpdu != NULL) { |
374 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; | 374 | struct sk_buff *skb = bf->bf_mpdu; |
375 | dma_unmap_single(sc->dev, bf->bf_dmacontext, | 375 | dma_unmap_single(sc->dev, bf->bf_dmacontext, |
376 | skb->len, DMA_TO_DEVICE); | 376 | skb->len, DMA_TO_DEVICE); |
377 | dev_kfree_skb_any(skb); | 377 | dev_kfree_skb_any(skb); |
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 689bdbf7880..87bbeaa6432 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
@@ -283,7 +283,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, | |||
283 | int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0; | 283 | int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0; |
284 | bool rc_update = true; | 284 | bool rc_update = true; |
285 | 285 | ||
286 | skb = (struct sk_buff *)bf->bf_mpdu; | 286 | skb = bf->bf_mpdu; |
287 | hdr = (struct ieee80211_hdr *)skb->data; | 287 | hdr = (struct ieee80211_hdr *)skb->data; |
288 | 288 | ||
289 | rcu_read_lock(); | 289 | rcu_read_lock(); |
@@ -444,7 +444,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, | |||
444 | u16 aggr_limit, legacy = 0, maxampdu; | 444 | u16 aggr_limit, legacy = 0, maxampdu; |
445 | int i; | 445 | int i; |
446 | 446 | ||
447 | skb = (struct sk_buff *)bf->bf_mpdu; | 447 | skb = bf->bf_mpdu; |
448 | tx_info = IEEE80211_SKB_CB(skb); | 448 | tx_info = IEEE80211_SKB_CB(skb); |
449 | rates = tx_info->control.rates; | 449 | rates = tx_info->control.rates; |
450 | tx_info_priv = (struct ath_tx_info_priv *)tx_info->rate_driver_data[0]; | 450 | 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) | |||
1452 | 1452 | ||
1453 | memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4); | 1453 | memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4); |
1454 | 1454 | ||
1455 | skb = (struct sk_buff *)bf->bf_mpdu; | 1455 | skb = bf->bf_mpdu; |
1456 | tx_info = IEEE80211_SKB_CB(skb); | 1456 | tx_info = IEEE80211_SKB_CB(skb); |
1457 | rates = tx_info->control.rates; | 1457 | rates = tx_info->control.rates; |
1458 | hdr = (struct ieee80211_hdr *)skb->data; | 1458 | hdr = (struct ieee80211_hdr *)skb->data; |
@@ -1586,7 +1586,7 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, | |||
1586 | static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, | 1586 | static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, |
1587 | struct ath_tx_control *txctl) | 1587 | struct ath_tx_control *txctl) |
1588 | { | 1588 | { |
1589 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; | 1589 | struct sk_buff *skb = bf->bf_mpdu; |
1590 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 1590 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
1591 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 1591 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
1592 | struct ath_node *an = NULL; | 1592 | struct ath_node *an = NULL; |
@@ -1860,7 +1860,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf, | |||
1860 | static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, | 1860 | static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, |
1861 | int nbad, int txok, bool update_rc) | 1861 | int nbad, int txok, bool update_rc) |
1862 | { | 1862 | { |
1863 | struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu; | 1863 | struct sk_buff *skb = bf->bf_mpdu; |
1864 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 1864 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
1865 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); | 1865 | struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); |
1866 | struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info); | 1866 | struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info); |