--- drivers/net/wireless/rt2x00/rt2x00queue.c

+++ drivers/net/wireless/rt2x00/rt2x00queue.c

@@ -103,7 +103,7 @@ void rt2x00queue_map_txskb(struct rt2x00

* is also mapped to the DMA so it can be used for transfering

* additional descriptor information to the hardware.

*/

- skb_push(skb, rt2x00dev->hw->extra_tx_headroom);

+ skb_push(skb, rt2x00dev->ops->extra_tx_headroom);

skbdesc->skb_dma =

dma_map_single(rt2x00dev->dev, skb->data, skb->len, DMA_TO_DEVICE);

@@ -111,7 +111,7 @@ void rt2x00queue_map_txskb(struct rt2x00

/*

* Restore data pointer to original location again.

*/

- skb_pull(skb, rt2x00dev->hw->extra_tx_headroom);

+ skb_pull(skb, rt2x00dev->ops->extra_tx_headroom);

skbdesc->flags |= SKBDESC_DMA_MAPPED_TX;

}

@@ -133,7 +133,7 @@ void rt2x00queue_unmap_skb(struct rt2x00

* by the driver, but it was actually mapped to DMA.

*/

dma_unmap_single(rt2x00dev->dev, skbdesc->skb_dma,

- skb->len + rt2x00dev->hw->extra_tx_headroom,

+ skb->len + rt2x00dev->ops->extra_tx_headroom,

DMA_TO_DEVICE);

skbdesc->flags &= ~SKBDESC_DMA_MAPPED_TX;

}