diff options
| author | Peter Denison <openwrt@marshadder.org> | 2007-06-25 19:52:55 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2007-06-25 19:52:55 +0000 |
| commit | 38f683ca8545e047ca09ce4262d6839f5e38aa35 (patch) | |
| tree | 9bc98534eff6f3b7550c7fa170e63c35670637cb /package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h | |
| parent | c62ae7c76e7f93c3e053ac2a92fece74c5b2c48e (diff) | |
| download | master-187ad058-38f683ca8545e047ca09ce4262d6839f5e38aa35.tar.gz master-187ad058-38f683ca8545e047ca09ce4262d6839f5e38aa35.tar.bz2 master-187ad058-38f683ca8545e047ca09ce4262d6839f5e38aa35.zip | |
Merge bcm43xx-mac80211 driver from tree at bu3sch.de, pulled 24/6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7734 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h')
| -rw-r--r-- | package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h b/package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h index 94fac2a8c4..3d109b173b 100644 --- a/package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h +++ b/package/bcm43xx-mac80211/src/bcm43xx/bcm43xx_dma.h @@ -252,10 +252,14 @@ struct bcm43xx_dmaring { u8 dma64; /* Boolean. Is this ring stopped at ieee80211 level? */ u8 stopped; + /* Lock, only used for TX. */ + spinlock_t lock; struct bcm43xx_wldev *dev; #ifdef CONFIG_BCM43XX_MAC80211_DEBUG /* Maximum number of used slots. */ int max_used_slots; + /* Last time we injected a ring overflow. */ + unsigned long last_injected_overflow; #endif /* CONFIG_BCM43XX_MAC80211_DEBUG*/ }; @@ -287,8 +291,8 @@ int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_wldev *dev, u16 bcm43xx_dmacontroller_base(int dma64bit, int dmacontroller_idx); -void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring); -void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring); +void bcm43xx_dma_tx_suspend(struct bcm43xx_wldev *dev); +void bcm43xx_dma_tx_resume(struct bcm43xx_wldev *dev); void bcm43xx_dma_get_tx_stats(struct bcm43xx_wldev *dev, struct ieee80211_tx_queue_stats *stats); @@ -349,11 +353,11 @@ void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring) { } static inline -void bcm43xx_dma_tx_suspend(struct bcm43xx_dmaring *ring) +void bcm43xx_dma_tx_suspend(struct bcm43xx_wldev *dev) { } static inline -void bcm43xx_dma_tx_resume(struct bcm43xx_dmaring *ring) +void bcm43xx_dma_tx_resume(struct bcm43xx_wldev *dev) { } |