4 files changed, 14 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index c9f59ce04746..ab3aa45db07b 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -4138,6 +4138,12 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
         INIT_WORK(&wl->rx_streaming_disable_work,
                   wl1271_rx_streaming_disable_work);
 
+        wl->freezable_wq = create_freezable_workqueue("wl12xx_wq");
+        if (!wl->freezable_wq) {
+                ret = -ENOMEM;
+                goto err_hw;
+        }
+
         wl->channel = WL1271_DEFAULT_CHANNEL;
         wl->beacon_int = WL1271_DEFAULT_BEACON_INT;
         wl->default_key = 0;
@@ -4182,7 +4188,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
         wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
         if (!wl->aggr_buf) {
                 ret = -ENOMEM;
-                goto err_hw;
+                goto err_wq;
         }
 
         wl->dummy_packet = wl12xx_alloc_dummy_packet(wl);
@@ -4227,6 +4233,9 @@ err_dummy_packet:
 err_aggr:
         free_pages((unsigned long)wl->aggr_buf, order);
 
+err_wq:
+        destroy_workqueue(wl->freezable_wq);
+
 err_hw:
         wl1271_debugfs_exit(wl);
         kfree(plat_dev);
@@ -4257,6 +4266,7 @@ int wl1271_free_hw(struct wl1271 *wl)
 
         kfree(wl->fw_status);
         kfree(wl->tx_res_if);
+        destroy_workqueue(wl->freezable_wq);
 
         ieee80211_free_hw(wl->hw);
 
diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c
index db230a503bf7..9357695340cf 100644
--- a/drivers/net/wireless/wl12xx/rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -150,7 +150,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length)
         skb_trim(skb, skb->len - desc->pad_len);
 
         skb_queue_tail(&wl->deferred_rx_queue, skb);
-        ieee80211_queue_work(wl->hw, &wl->netstack_work);
+        queue_work(wl->freezable_wq, &wl->netstack_work);
 
         return is_data;
 }
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index b2635c7ecee8..200590c0d9e3 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -727,7 +727,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 
         /* return the packet to the stack */
         skb_queue_tail(&wl->deferred_tx_queue, skb);
-        ieee80211_queue_work(wl->hw, &wl->netstack_work);
+        queue_work(wl->freezable_wq, &wl->netstack_work);
         wl1271_free_tx_id(wl, result->id);
 }
 
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 145a14c22583..bbf4ee6d4102 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -445,6 +445,7 @@ struct wl1271 {
         struct sk_buff_head deferred_tx_queue;
 
         struct work_struct tx_work;
+        struct workqueue_struct *freezable_wq;
 
         /* Pending TX frames */
         unsigned long tx_frames_map[BITS_TO_LONGS(ACX_TX_DESCRIPTORS)];