diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c index 029a45f0cb99..dfc886fcb44d 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c | |||
@@ -652,7 +652,7 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
652 | { | 652 | { |
653 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); | 653 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); |
654 | __le32 *txd = skbdesc->desc; | 654 | __le32 *txd = skbdesc->desc; |
655 | __le32 *txwi = (__le32 *)(skb->data - rt2x00dev->hw->extra_tx_headroom); | 655 | __le32 *txwi = (__le32 *)(skb->data - rt2x00dev->ops->extra_tx_headroom); |
656 | u32 word; | 656 | u32 word; |
657 | 657 | ||
658 | /* | 658 | /* |
@@ -725,14 +725,14 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
725 | rt2x00_set_field32(&word, TXD_W1_BURST, | 725 | rt2x00_set_field32(&word, TXD_W1_BURST, |
726 | test_bit(ENTRY_TXD_BURST, &txdesc->flags)); | 726 | test_bit(ENTRY_TXD_BURST, &txdesc->flags)); |
727 | rt2x00_set_field32(&word, TXD_W1_SD_LEN0, | 727 | rt2x00_set_field32(&word, TXD_W1_SD_LEN0, |
728 | rt2x00dev->hw->extra_tx_headroom); | 728 | rt2x00dev->ops->extra_tx_headroom); |
729 | rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0); | 729 | rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0); |
730 | rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0); | 730 | rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0); |
731 | rt2x00_desc_write(txd, 1, word); | 731 | rt2x00_desc_write(txd, 1, word); |
732 | 732 | ||
733 | rt2x00_desc_read(txd, 2, &word); | 733 | rt2x00_desc_read(txd, 2, &word); |
734 | rt2x00_set_field32(&word, TXD_W2_SD_PTR1, | 734 | rt2x00_set_field32(&word, TXD_W2_SD_PTR1, |
735 | skbdesc->skb_dma + rt2x00dev->hw->extra_tx_headroom); | 735 | skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom); |
736 | rt2x00_desc_write(txd, 2, word); | 736 | rt2x00_desc_write(txd, 2, word); |
737 | 737 | ||
738 | rt2x00_desc_read(txd, 3, &word); | 738 | rt2x00_desc_read(txd, 3, &word); |
@@ -1207,6 +1207,7 @@ static const struct rt2x00_ops rt2800pci_ops = { | |||
1207 | .eeprom_size = EEPROM_SIZE, | 1207 | .eeprom_size = EEPROM_SIZE, |
1208 | .rf_size = RF_SIZE, | 1208 | .rf_size = RF_SIZE, |
1209 | .tx_queues = NUM_TX_QUEUES, | 1209 | .tx_queues = NUM_TX_QUEUES, |
1210 | .extra_tx_headroom = TXWI_DESC_SIZE, | ||
1210 | .rx = &rt2800pci_queue_rx, | 1211 | .rx = &rt2800pci_queue_rx, |
1211 | .tx = &rt2800pci_queue_tx, | 1212 | .tx = &rt2800pci_queue_tx, |
1212 | .bcn = &rt2800pci_queue_bcn, | 1213 | .bcn = &rt2800pci_queue_bcn, |