diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-01 16:04:59 -0700 |
| commit | fb65f180e02dde224af256b43d3ab2c28b9689d7 (patch) | |
| tree | 72b66091be51f3f16c2f9aae75be386a9fccc620 /drivers/net/wireless/b43/b43.h | |
| parent | ab59859de1946a098b091308380179e92dc7683b (diff) | |
| parent | 61c2b682b8391f13b67e2d95990a0aba34697d9c (diff) | |
| download | talos-obmc-linux-fb65f180e02dde224af256b43d3ab2c28b9689d7.tar.gz talos-obmc-linux-fb65f180e02dde224af256b43d3ab2c28b9689d7.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
| -rw-r--r-- | drivers/net/wireless/b43/b43.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index eff2a158a411..37783cdd301a 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -691,6 +691,10 @@ struct b43_wl { struct mutex mutex; spinlock_t irq_lock; + /* R/W lock for data transmission. + * Transmissions on 2+ queues can run concurrently, but somebody else + * might sync with TX by write_lock_irqsave()'ing. */ + rwlock_t tx_lock; /* Lock for LEDs access. */ spinlock_t leds_lock; /* Lock for SHM access. */ |
