diff options
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 3d3127685881..419aca1fc4fe 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "xmit.h" | 30 | #include "xmit.h" |
31 | #include "phy.h" | 31 | #include "phy.h" |
32 | #include "dma.h" | 32 | #include "dma.h" |
33 | #include "pio.h" | 33 | |
34 | 34 | ||
35 | /* Extract the bitrate out of a CCK PLCP header. */ | 35 | /* Extract the bitrate out of a CCK PLCP header. */ |
36 | static u8 b43_plcp_get_bitrate_cck(struct b43_plcp_hdr6 *plcp) | 36 | static u8 b43_plcp_get_bitrate_cck(struct b43_plcp_hdr6 *plcp) |
@@ -604,10 +604,7 @@ void b43_handle_txstatus(struct b43_wldev *dev, | |||
604 | dev->wl->ieee_stats.dot11RTSSuccessCount++; | 604 | dev->wl->ieee_stats.dot11RTSSuccessCount++; |
605 | } | 605 | } |
606 | 606 | ||
607 | if (b43_using_pio(dev)) | 607 | b43_dma_handle_txstatus(dev, status); |
608 | b43_pio_handle_txstatus(dev, status); | ||
609 | else | ||
610 | b43_dma_handle_txstatus(dev, status); | ||
611 | } | 608 | } |
612 | 609 | ||
613 | /* Handle TX status report as received through DMA/PIO queues */ | 610 | /* Handle TX status report as received through DMA/PIO queues */ |
@@ -636,19 +633,13 @@ void b43_handle_hwtxstatus(struct b43_wldev *dev, | |||
636 | /* Stop any TX operation on the device (suspend the hardware queues) */ | 633 | /* Stop any TX operation on the device (suspend the hardware queues) */ |
637 | void b43_tx_suspend(struct b43_wldev *dev) | 634 | void b43_tx_suspend(struct b43_wldev *dev) |
638 | { | 635 | { |
639 | if (b43_using_pio(dev)) | 636 | b43_dma_tx_suspend(dev); |
640 | b43_pio_freeze_txqueues(dev); | ||
641 | else | ||
642 | b43_dma_tx_suspend(dev); | ||
643 | } | 637 | } |
644 | 638 | ||
645 | /* Resume any TX operation on the device (resume the hardware queues) */ | 639 | /* Resume any TX operation on the device (resume the hardware queues) */ |
646 | void b43_tx_resume(struct b43_wldev *dev) | 640 | void b43_tx_resume(struct b43_wldev *dev) |
647 | { | 641 | { |
648 | if (b43_using_pio(dev)) | 642 | b43_dma_tx_resume(dev); |
649 | b43_pio_thaw_txqueues(dev); | ||
650 | else | ||
651 | b43_dma_tx_resume(dev); | ||
652 | } | 643 | } |
653 | 644 | ||
654 | #if 0 | 645 | #if 0 |