Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c

1 files changed, 19 insertions, 27 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index ebc17ad61de..cabf249aa55 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -200,13 +200,6 @@ static void rt2800pci_start_queue(struct data_queue *queue)
                 rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
                 break;
         case QID_BEACON:
-                /*
-                 * Allow beacon tasklets to be scheduled for periodic
-                 * beacon updates.
-                 */
-                tasklet_enable(&rt2x00dev->tbtt_tasklet);
-                tasklet_enable(&rt2x00dev->pretbtt_tasklet);
-
                 rt2x00pci_register_read(rt2x00dev, BCN_TIME_CFG, &reg);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TSF_TICKING, 1);
                 rt2x00_set_field32(&reg, BCN_TIME_CFG_TBTT_ENABLE, 1);
@@ -269,10 +262,13 @@ static void rt2800pci_stop_queue(struct data_queue *queue)
                 rt2x00pci_register_write(rt2x00dev, INT_TIMER_EN, reg);
 
                 /*
-                 * Wait for tbtt tasklets to finish.
+                 * Wait for current invocation to finish. The tasklet
+                 * won't be scheduled anymore afterwards since we disabled
+                 * the TBTT and PRE TBTT timer.
                  */
-                tasklet_disable(&rt2x00dev->tbtt_tasklet);
-                tasklet_disable(&rt2x00dev->pretbtt_tasklet);
+                tasklet_kill(&rt2x00dev->tbtt_tasklet);
+                tasklet_kill(&rt2x00dev->pretbtt_tasklet);
+
                 break;
         default:
                 break;
@@ -437,14 +433,6 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
         if (state == STATE_RADIO_IRQ_ON) {
                 rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
                 rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
-
-                /*
-                 * Enable tasklets. The beacon related tasklets are
-                 * enabled when the beacon queue is started.
-                 */
-                tasklet_enable(&rt2x00dev->txstatus_tasklet);
-                tasklet_enable(&rt2x00dev->rxdone_tasklet);
-                tasklet_enable(&rt2x00dev->autowake_tasklet);
         }
 
         spin_lock_irqsave(&rt2x00dev->irqmask_lock, flags);
@@ -472,12 +460,13 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
 
         if (state == STATE_RADIO_IRQ_OFF) {
                 /*
-                 * Ensure that all tasklets are finished before
-                 * disabling the interrupts.
+                 * Wait for possibly running tasklets to finish.
                  */
-                tasklet_disable(&rt2x00dev->txstatus_tasklet);
-                tasklet_disable(&rt2x00dev->rxdone_tasklet);
-                tasklet_disable(&rt2x00dev->autowake_tasklet);
+                tasklet_kill(&rt2x00dev->txstatus_tasklet);
+                tasklet_kill(&rt2x00dev->rxdone_tasklet);
+                tasklet_kill(&rt2x00dev->autowake_tasklet);
+                tasklet_kill(&rt2x00dev->tbtt_tasklet);
+                tasklet_kill(&rt2x00dev->pretbtt_tasklet);
         }
 }
 
@@ -813,14 +802,16 @@ static void rt2800pci_pretbtt_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
         rt2x00lib_pretbtt(rt2x00dev);
-        rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_PRE_TBTT);
+        if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_PRE_TBTT);
 }
 
 static void rt2800pci_tbtt_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
         rt2x00lib_beacondone(rt2x00dev);
-        rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_TBTT);
+        if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_TBTT);
 }
 
 static void rt2800pci_rxdone_tasklet(unsigned long data)
@@ -828,7 +819,7 @@ static void rt2800pci_rxdone_tasklet(unsigned long data)
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
         if (rt2x00pci_rxdone(rt2x00dev))
                 tasklet_schedule(&rt2x00dev->rxdone_tasklet);
-        else
+        else if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
                 rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_RX_DONE);
 }
 
@@ -836,7 +827,8 @@ static void rt2800pci_autowake_tasklet(unsigned long data)
 {
         struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev *)data;
         rt2800pci_wakeup(rt2x00dev);
-        rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_AUTO_WAKEUP);
+        if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
+                rt2800pci_enable_interrupt(rt2x00dev, INT_MASK_CSR_AUTO_WAKEUP);
 }
 
 static void rt2800pci_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)