diff options
author | Michael Buesch <mbuesch@freenet.de> | 2006-01-27 16:26:20 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-27 16:18:24 (GMT) |
commit | ea72ab229fe9cdfe3d3f70a6e64d98c725294b24 (patch) | |
tree | 96bdbed22cac7b7256fe4b1e98f9b710edc68851 /drivers/net/wireless/bcm43xx/bcm43xx_dma.h | |
parent | 70e5e983f8a3f801a96bfeb0682cd2955ec3c8ce (diff) | |
download | linux-fsl-qoriq-ea72ab229fe9cdfe3d3f70a6e64d98c725294b24.tar.xz |
[PATCH] bcm43xx: sync with svn.berlios.de
Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_dma.h')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h index e32cf68..93e99d6 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h @@ -122,7 +122,6 @@ struct bcm43xx_dmadesc_meta { }; struct bcm43xx_dmaring { - spinlock_t lock; struct bcm43xx_private *bcm; /* Kernel virtual base address of the ring memory. */ struct bcm43xx_dmadesc *vbase; @@ -166,11 +165,11 @@ int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm, int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm, u16 dmacontroller_mmio_base); -int FASTCALL(bcm43xx_dma_transfer_txb(struct bcm43xx_private *bcm, - struct ieee80211_txb *txb)); -void FASTCALL(bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm, - struct bcm43xx_xmitstatus *status)); +void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm, + struct bcm43xx_xmitstatus *status); -void FASTCALL(bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)); +int bcm43xx_dma_tx(struct bcm43xx_private *bcm, + struct ieee80211_txb *txb); +void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring); #endif /* BCM43xx_DMA_H_ */ |