Commit a888d52d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

ath5k: use IEEE80211_SKB_CB

ath5k still uses the "(void*) skb->cb" direct cast, use IEEE80211_SKB_CB
instead.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ef707b83
...@@ -1296,7 +1296,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) ...@@ -1296,7 +1296,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
struct ath5k_txq *txq = sc->txq; struct ath5k_txq *txq = sc->txq;
struct ath5k_desc *ds = bf->desc; struct ath5k_desc *ds = bf->desc;
struct sk_buff *skb = bf->skb; struct sk_buff *skb = bf->skb;
struct ieee80211_tx_info *info = (void*) skb->cb; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID; unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID;
int ret; int ret;
...@@ -1945,7 +1945,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq) ...@@ -1945,7 +1945,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
} }
skb = bf->skb; skb = bf->skb;
info = (void*) skb->cb; info = IEEE80211_SKB_CB(skb);
bf->skb = NULL; bf->skb = NULL;
pci_unmap_single(sc->pdev, bf->skbaddr, skb->len, pci_unmap_single(sc->pdev, bf->skbaddr, skb->len,
...@@ -2003,7 +2003,7 @@ static int ...@@ -2003,7 +2003,7 @@ static int
ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf)
{ {
struct sk_buff *skb = bf->skb; struct sk_buff *skb = bf->skb;
struct ieee80211_tx_info *info = (void*) skb->cb; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ath5k_hw *ah = sc->ah; struct ath5k_hw *ah = sc->ah;
struct ath5k_desc *ds; struct ath5k_desc *ds;
int ret, antenna = 0; int ret, antenna = 0;
...@@ -2625,7 +2625,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) ...@@ -2625,7 +2625,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct ath5k_softc *sc = hw->priv; struct ath5k_softc *sc = hw->priv;
struct ath5k_buf *bf; struct ath5k_buf *bf;
struct ieee80211_tx_info *info = (void*) skb->cb; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
unsigned long flags; unsigned long flags;
int hdrlen; int hdrlen;
int pad; int pad;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment