aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/work.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-05 11:02:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 15:26:40 -0400
commit7da7cc1d42d8ce02cca16df8c021e6d657f1f8fd (patch)
tree3d18e0b36edfcc015d27f66890cf4a8d60c45bda /net/mac80211/work.c
parent1fdaa46e9f26ccbab5e0eb8c4d4f8e1fbf32c7df (diff)
mac80211: per interface idle notification
Sometimes we don't just need to know whether or not the device is idle, but also per interface. This adds that reporting capability to mac80211. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/work.c')
-rw-r--r--net/mac80211/work.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index b98af64f5862..ae344d1ba056 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -888,10 +888,10 @@ static void ieee80211_work_work(struct work_struct *work)
888 while ((skb = skb_dequeue(&local->work_skb_queue))) 888 while ((skb = skb_dequeue(&local->work_skb_queue)))
889 ieee80211_work_rx_queued_mgmt(local, skb); 889 ieee80211_work_rx_queued_mgmt(local, skb);
890 890
891 ieee80211_recalc_idle(local);
892
893 mutex_lock(&local->mtx); 891 mutex_lock(&local->mtx);
894 892
893 ieee80211_recalc_idle(local);
894
895 list_for_each_entry_safe(wk, tmp, &local->work_list, list) { 895 list_for_each_entry_safe(wk, tmp, &local->work_list, list) {
896 bool started = wk->started; 896 bool started = wk->started;
897 897
@@ -1001,10 +1001,10 @@ static void ieee80211_work_work(struct work_struct *work)
1001 &local->scan_work, 1001 &local->scan_work,
1002 round_jiffies_relative(0)); 1002 round_jiffies_relative(0));
1003 1003
1004 mutex_unlock(&local->mtx);
1005
1006 ieee80211_recalc_idle(local); 1004 ieee80211_recalc_idle(local);
1007 1005
1006 mutex_unlock(&local->mtx);
1007
1008 list_for_each_entry_safe(wk, tmp, &free_work, list) { 1008 list_for_each_entry_safe(wk, tmp, &free_work, list) {
1009 wk->done(wk, NULL); 1009 wk->done(wk, NULL);
1010 list_del(&wk->list); 1010 list_del(&wk->list);