Skip to content

Commit

Permalink
wl12xx: use freezable workqueue for netstack_work
Browse files Browse the repository at this point in the history
When resuming (after wowlan), we want the rx packets (which is
usually the wake-up packet itself) to be passed to mac80211 only
after the resume notifier was completed, and mac80211 is up and
running (otherwise, the packets will be dropped).

By enqueueing the netstack_work to a freezable workqueue, we can
guarantee the rx processing to occur only after mac80211 was resumed.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Jun 27, 2011
1 parent c27d3ac commit 92ef896
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
12 changes: 11 additions & 1 deletion drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -4227,6 +4233,9 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
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);
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/wl12xx/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/wl12xx/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions drivers/net/wireless/wl12xx/wl12xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down

0 comments on commit 92ef896

Please sign in to comment.