diff options
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 18e9422d26dd..85045afc1ba7 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -1296,7 +1296,7 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) | |||
1296 | struct ath5k_txq *txq = sc->txq; | 1296 | struct ath5k_txq *txq = sc->txq; |
1297 | struct ath5k_desc *ds = bf->desc; | 1297 | struct ath5k_desc *ds = bf->desc; |
1298 | struct sk_buff *skb = bf->skb; | 1298 | struct sk_buff *skb = bf->skb; |
1299 | struct ieee80211_tx_info *info = (void*) skb->cb; | 1299 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
1300 | unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID; | 1300 | unsigned int pktlen, flags, keyidx = AR5K_TXKEYIX_INVALID; |
1301 | int ret; | 1301 | int ret; |
1302 | 1302 | ||
@@ -1945,7 +1945,7 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq) | |||
1945 | } | 1945 | } |
1946 | 1946 | ||
1947 | skb = bf->skb; | 1947 | skb = bf->skb; |
1948 | info = (void*) skb->cb; | 1948 | info = IEEE80211_SKB_CB(skb); |
1949 | bf->skb = NULL; | 1949 | bf->skb = NULL; |
1950 | 1950 | ||
1951 | pci_unmap_single(sc->pdev, bf->skbaddr, skb->len, | 1951 | pci_unmap_single(sc->pdev, bf->skbaddr, skb->len, |
@@ -2003,7 +2003,7 @@ static int | |||
2003 | ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) | 2003 | ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf) |
2004 | { | 2004 | { |
2005 | struct sk_buff *skb = bf->skb; | 2005 | struct sk_buff *skb = bf->skb; |
2006 | struct ieee80211_tx_info *info = (void*) skb->cb; | 2006 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
2007 | struct ath5k_hw *ah = sc->ah; | 2007 | struct ath5k_hw *ah = sc->ah; |
2008 | struct ath5k_desc *ds; | 2008 | struct ath5k_desc *ds; |
2009 | int ret, antenna = 0; | 2009 | int ret, antenna = 0; |
@@ -2625,7 +2625,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
2625 | { | 2625 | { |
2626 | struct ath5k_softc *sc = hw->priv; | 2626 | struct ath5k_softc *sc = hw->priv; |
2627 | struct ath5k_buf *bf; | 2627 | struct ath5k_buf *bf; |
2628 | struct ieee80211_tx_info *info = (void*) skb->cb; | 2628 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
2629 | unsigned long flags; | 2629 | unsigned long flags; |
2630 | int hdrlen; | 2630 | int hdrlen; |
2631 | int pad; | 2631 | int pad; |