diff options
| author | John W. Linville | 2014-03-13 19:21:43 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-03-13 19:21:43 +0100 |
| commit | 42775a34d23027b19e984956a539448f5e7ff075 (patch) | |
| tree | e344340c7f0aed4c8faf7534fabbc64607a8e784 /net/mac80211/iface.c | |
| parent | net: sctp: remove NULL check in sctp_assoc_update_retran_path (diff) | |
| parent | rtlwifi: rtl8723be: Fix array dimension problems (diff) | |
| download | kernel-qcow2-linux-42775a34d23027b19e984956a539448f5e7ff075.tar.gz kernel-qcow2-linux-42775a34d23027b19e984956a539448f5e7ff075.tar.xz kernel-qcow2-linux-42775a34d23027b19e984956a539448f5e7ff075.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 088111af6c7c..b8d331e7d883 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -101,9 +101,8 @@ static u32 __ieee80211_idle_on(struct ieee80211_local *local) static u32 __ieee80211_recalc_idle(struct ieee80211_local *local, bool force_active) { - bool working = false, scanning, active; + bool working, scanning, active; unsigned int led_trig_start = 0, led_trig_stop = 0; - struct ieee80211_roc_work *roc; lockdep_assert_held(&local->mtx); @@ -111,12 +110,8 @@ static u32 __ieee80211_recalc_idle(struct ieee80211_local *local, !list_empty(&local->chanctx_list) || local->monitors; - if (!local->ops->remain_on_channel) { - list_for_each_entry(roc, &local->roc_list, list) { - working = true; - break; - } - } + working = !local->ops->remain_on_channel && + !list_empty(&local->roc_list); scanning = test_bit(SCAN_SW_SCANNING, &local->scanning) || test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning); |