summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2800pci.c
diff options
context:
space:
mode:
authorHelmut Schaa2011-01-30 13:18:13 +0100
committerJohn W. Linville2011-01-31 21:06:23 +0100
commitc8e15a1e2c93880160f31ed2e6b02c1322f7f48d (patch)
tree2019999e956bfe9b6edd4ac1e84c855fbbd8db94 /drivers/net/wireless/rt2x00/rt2800pci.c
parentrt2x00: Introduce tasklets for interrupt handling (diff)
downloadkernel-qcow2-linux-c8e15a1e2c93880160f31ed2e6b02c1322f7f48d.tar.gz
kernel-qcow2-linux-c8e15a1e2c93880160f31ed2e6b02c1322f7f48d.tar.xz
kernel-qcow2-linux-c8e15a1e2c93880160f31ed2e6b02c1322f7f48d.zip
rt2x00: Disable txstatus tasklet by default
Enable the txstatus tasklet when interrupts are enabled and disable it together with the interrupts. Also make the txstatus tasklet useful even without the tx status FIFO and make use of the generic rt2x00 tasklet initialization macro. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800pci.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 54e37e08c114..e4d97ad25bf4 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -416,7 +416,10 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
if (state == STATE_RADIO_IRQ_ON) {
rt2800_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- }
+
+ tasklet_enable(&rt2x00dev->txstatus_tasklet);
+ } else if (state == STATE_RADIO_IRQ_OFF)
+ tasklet_disable(&rt2x00dev->txstatus_tasklet);
rt2800_register_read(rt2x00dev, INT_MASK_CSR, &reg);
rt2x00_set_field32(&reg, INT_MASK_CSR_RXDELAYINT, 0);