summaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-15 16:16:15 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-15 16:16:15 +0200
commit1a10390708d675ebf1a2f5e169a5165626afbd88 (patch)
treed9ee7d10abd65e580fb74152a501089f51174225 /net/mac80211/util.c
parent239bd83104ec6bcba90221d8b0973d2565142ef8 (diff)
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff)
downloadtalos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz
talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 19f85e1b3695..0d463c80c404 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -361,6 +361,7 @@ void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
struct ieee80211_local *local = hw_to_local(hw);
if (test_bit(queue, local->queues_pending)) {
+ set_bit(queue, local->queues_pending_run);
tasklet_schedule(&local->tx_pending_tasklet);
} else {
netif_wake_subqueue(local->mdev, queue);
OpenPOWER on IntegriCloud