2 files changed, 34 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 985982bb65e2..696513113d9f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -520,6 +520,10 @@ struct rt2x00lib_ops {
          * TX status tasklet handler.
          */
         void (*txstatus_tasklet) (unsigned long data);
+        void (*pretbtt_tasklet) (unsigned long data);
+        void (*tbtt_tasklet) (unsigned long data);
+        void (*rxdone_tasklet) (unsigned long data);
+        void (*autowake_tasklet) (unsigned long data);
 
         /*
          * Device init handlers.
@@ -905,6 +909,15 @@ struct rt2x00_dev {
          * Tasklet for processing tx status reports (rt2800pci).
          */
         struct tasklet_struct txstatus_tasklet;
+        struct tasklet_struct pretbtt_tasklet;
+        struct tasklet_struct tbtt_tasklet;
+        struct tasklet_struct rxdone_tasklet;
+        struct tasklet_struct autowake_tasklet;
+
+        /*
+         * Protect the interrupt mask register.
+         */
+        spinlock_t irqmask_lock;
 };
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 50b379a6c9ee..7d4dece64c1a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -831,6 +831,26 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
         }
 
         /*
+         * Initialize tasklets if used by the driver. Tasklets are
+         * disabled until the interrupts are turned on. The driver
+         * has to handle that.
+         */
+#define RT2X00_TASKLET_INIT(taskletname) \
+        if (rt2x00dev->ops->lib->taskletname) { \
+                tasklet_init(&rt2x00dev->taskletname, \
+                             rt2x00dev->ops->lib->taskletname, \
+                             (unsigned long)rt2x00dev); \
+                tasklet_disable(&rt2x00dev->taskletname); \
+        }
+
+        RT2X00_TASKLET_INIT(pretbtt_tasklet);
+        RT2X00_TASKLET_INIT(tbtt_tasklet);
+        RT2X00_TASKLET_INIT(rxdone_tasklet);
+        RT2X00_TASKLET_INIT(autowake_tasklet);
+
+#undef RT2X00_TASKLET_INIT
+
+        /*
          * Register HW.
          */
         status = ieee80211_register_hw(rt2x00dev->hw);
@@ -958,6 +978,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 {
         int retval = -ENOMEM;
 
+        spin_lock_init(&rt2x00dev->irqmask_lock);
         mutex_init(&rt2x00dev->csr_mutex);
 
         set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);