mac80211: redefine usage of the mac80211 workqueue

The mac80211 workqueue exists to enable mac80211 and drivers
to queue their own work on a single threaded workqueue. mac80211
takes care to flush the workqueue during suspend but we never
really had requirements on drivers for how they should use
the workqueue in consideration for suspend.

We extend mac80211 to document how the mac80211 workqueue should
be used, how it should not be used and finally move raw access to
the workqueue to mac80211 only. Drivers and mac80211 use helpers
to queue work onto the mac80211 workqueue:

  * ieee80211_queue_work()
  * ieee80211_queue_delayed_work()

These helpers will now warn if mac80211 already completed its
suspend cycle and someone is trying to queue work. mac80211
flushes the mac80211 workqueue prior to suspend a few times,
but we haven't taken the care to ensure drivers won't add more
work after suspend. To help with this we add a warning when
someone tries to add work and mac80211 already completed the
suspend cycle.

Drivers should ensure they cancel any work or delayed work
in the mac80211 stop() callback.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 6 insertions, 7 deletions

diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/p54/led.c
index c00115b206d4..9575ac033630 100644
--- a/drivers/net/wireless/p54/led.c
+++ b/drivers/net/wireless/p54/led.c
@@ -61,7 +61,7 @@ static void p54_update_leds(struct work_struct *work)
                         wiphy_name(priv->hw->wiphy), err);
 
         if (rerun)
-                queue_delayed_work(priv->hw->workqueue, &priv->led_work,
+                ieee80211_queue_delayed_work(priv->hw, &priv->led_work,
                         msecs_to_jiffies(blink_delay));
 }
 
@@ -78,8 +78,7 @@ static void p54_led_brightness_set(struct led_classdev *led_dev,
 
         if ((brightness) && (led->registered)) {
                 led->toggled++;
-                queue_delayed_work(priv->hw->workqueue, &priv->led_work,
-                                   HZ/10);
+                ieee80211_queue_delayed_work(priv->hw, &priv->led_work, HZ/10);
         }
 }
 
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 955f6d7ec16a..a0d0e726bc4e 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -180,7 +180,7 @@ static int p54_start(struct ieee80211_hw *dev)
                 goto out;
         }
 
-        queue_delayed_work(dev->workqueue, &priv->work, 0);
+        ieee80211_queue_delayed_work(dev, &priv->work, 0);
 
         priv->softled_state = 0;
         err = p54_set_leds(priv);
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index eef532987d05..05458d9249ce 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -391,7 +391,7 @@ static irqreturn_t p54spi_interrupt(int irq, void *config)
         struct spi_device *spi = config;
         struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
 
-        queue_work(priv->hw->workqueue, &priv->work);
+        ieee80211_queue_work(priv->hw, &priv->work);
 
         return IRQ_HANDLED;
 }
@@ -479,7 +479,7 @@ static void p54spi_op_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
         list_add_tail(&di->tx_list, &priv->tx_pending);
         spin_unlock_irqrestore(&priv->tx_lock, flags);
 
-        queue_work(priv->hw->workqueue, &priv->work);
+        ieee80211_queue_work(priv->hw, &priv->work);
 }
 
 static void p54spi_work(struct work_struct *work)
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index c32a0d2fa1f7..704685fab177 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -380,7 +380,7 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)
 
         ieee80211_rx_irqsafe(priv->hw, skb);
 
-        queue_delayed_work(priv->hw->workqueue, &priv->work,
+        ieee80211_queue_delayed_work(priv->hw, &priv->work,
                            msecs_to_jiffies(P54_STATISTICS_UPDATE));
 
         return -1;