diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-10-26 18:27:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:24:46 -0500 |
commit | 4bdd1e978ede034c1211957eb17eaf50de00d234 (patch) | |
tree | 156a3d3bd8b4c89e3a36103d14d9afe9cfce7bd0 /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | 9d94674ab754be0e275120a183670ead435f9c0d (diff) |
ath9k: move the PCU lock to the sc structure
The PCU lock should be used to contend TX DMA as well,
this will be done next.
This is part of a series of patches which fix stopping
TX DMA completley when requested on the driver.
For more details about this issue refer to this thread:
http://marc.info/?l=linux-wireless&m=128629803703756&w=2
Tested-by: Ben Greear <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index cb9194a5b561..61d450750acb 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -309,7 +309,6 @@ struct ath_rx { | |||
309 | u8 rxotherant; | 309 | u8 rxotherant; |
310 | u32 *rxlink; | 310 | u32 *rxlink; |
311 | unsigned int rxfilter; | 311 | unsigned int rxfilter; |
312 | spinlock_t pcu_lock; | ||
313 | spinlock_t rxbuflock; | 312 | spinlock_t rxbuflock; |
314 | struct list_head rxbuf; | 313 | struct list_head rxbuf; |
315 | struct ath_descdma rxdma; | 314 | struct ath_descdma rxdma; |
@@ -601,6 +600,7 @@ struct ath_softc { | |||
601 | int irq; | 600 | int irq; |
602 | spinlock_t sc_serial_rw; | 601 | spinlock_t sc_serial_rw; |
603 | spinlock_t sc_pm_lock; | 602 | spinlock_t sc_pm_lock; |
603 | spinlock_t sc_pcu_lock; | ||
604 | struct mutex mutex; | 604 | struct mutex mutex; |
605 | struct work_struct paprd_work; | 605 | struct work_struct paprd_work; |
606 | struct work_struct hw_check_work; | 606 | struct work_struct hw_check_work; |