Merge branch 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / net / wireless / b43legacy / dma.h

diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h
index 504a58767e95e293edad8acddf4c513148d54939..c3282f906bc7bd2c108a15e9c3d985efd0eb3668 100644 (file)
--- a/drivers/net/wireless/b43legacy/dma.h
+++ b/drivers/net/wireless/b43legacy/dma.h
@@ -150,8 +150,9 @@ struct b43legacy_dmaring {
        enum b43legacy_dmatype type;
        /* Boolean. Is this ring stopped at ieee80211 level? */
        bool stopped;
-       /* Lock, only used for TX. */
-       spinlock_t lock;
+       /* The QOS priority assigned to this ring. Only used for TX rings.
+        * This is the mac80211 "queue" value. */
+       u8 queue_prio;
        struct b43legacy_wldev *dev;
 #ifdef CONFIG_B43LEGACY_DEBUG
        /* Maximum number of used slots. */