Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df180f7 authored by Zhao, Gang's avatar Zhao, Gang Committed by Johannes Berg
Browse files

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: default avatarZhao, Gang <gamerh2o@gmail.com>
[change subject]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8eca1fb6

net/mac80211/util.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -1565,7 +1565,6 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		list_for_each_entry(ctx, &local->chanctx_list, list)

		list_for_each_entry(ctx, &local->chanctx_list, list)

			WARN_ON(drv_add_chanctx(local, ctx));

			WARN_ON(drv_add_chanctx(local, ctx));

		mutex_unlock(&local->chanctx_mtx);

		mutex_unlock(&local->chanctx_mtx);

	}





		list_for_each_entry(sdata, &local->interfaces, list) {

		list_for_each_entry(sdata, &local->interfaces, list) {

			if (!ieee80211_sdata_running(sdata))

			if (!ieee80211_sdata_running(sdata))
@@ -1576,6 +1575,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		sdata = rtnl_dereference(local->monitor_sdata);

		sdata = rtnl_dereference(local->monitor_sdata);

		if (sdata && ieee80211_sdata_running(sdata))

		if (sdata && ieee80211_sdata_running(sdata))

			ieee80211_assign_chanctx(local, sdata);

			ieee80211_assign_chanctx(local, sdata);

	}





	/* add STAs back */

	/* add STAs back */

	mutex_lock(&local->sta_mtx);

	mutex_lock(&local->sta_mtx);