diff options
| author | Zhao, Gang | 2014-04-26 03:43:40 +0200 |
|---|---|---|
| committer | Johannes Berg | 2014-04-28 17:52:32 +0200 |
| commit | 7df180f7f19355ba3017f6d6d74c2008b66db43d (patch) | |
| tree | d77aa63f53e6a3192ad0c6f6f63ebc5411687328 /net/mac80211/util.c | |
| parent | cfg80211: Use 5MHz bandwidth by default when checking usable channels (diff) | |
| download | kernel-qcow2-linux-7df180f7f19355ba3017f6d6d74c2008b66db43d.tar.gz kernel-qcow2-linux-7df180f7f19355ba3017f6d6d74c2008b66db43d.tar.xz kernel-qcow2-linux-7df180f7f19355ba3017f6d6d74c2008b66db43d.zip | |
mac80211: avoid calling useless channel context code
ieee80211_assign_chanctx() checks if local->use_chanctx is true, so
the two code block related to ieee80211_assign_chanctx() can be moved
into above if clause, emphasize that these code are executed only if
local->use_chanctx is true.
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
[change subject]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7a376f826cf8..cafbae701d3d 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1565,17 +1565,17 @@ int ieee80211_reconfig(struct ieee80211_local *local) list_for_each_entry(ctx, &local->chanctx_list, list) WARN_ON(drv_add_chanctx(local, ctx)); mutex_unlock(&local->chanctx_mtx); - } - list_for_each_entry(sdata, &local->interfaces, list) { - if (!ieee80211_sdata_running(sdata)) - continue; - ieee80211_assign_chanctx(local, sdata); - } + list_for_each_entry(sdata, &local->interfaces, list) { + if (!ieee80211_sdata_running(sdata)) + continue; + ieee80211_assign_chanctx(local, sdata); + } - sdata = rtnl_dereference(local->monitor_sdata); - if (sdata && ieee80211_sdata_running(sdata)) - ieee80211_assign_chanctx(local, sdata); + sdata = rtnl_dereference(local->monitor_sdata); + if (sdata && ieee80211_sdata_running(sdata)) + ieee80211_assign_chanctx(local, sdata); + } /* add STAs back */ mutex_lock(&local->sta_mtx); |