Commit e10b6801 authored Jun 14, 2022 by Andrei Otcheretianski Committed by Johannes Berg Jul 15, 2022

wifi: mac80211: don't check carrier in chanctx code



We check here that we don't enable TX (netif_carrier_ok())
before we actually start using some channel context, but to
our knowledge this check has never triggered, and with MLO
it's just wrong since links can be added and removed much
more dynamically than before.

Simply remove the checks, there's no really good way to do
anything that would replace them.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 69c3f2d3

net/mac80211/chan.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1800,8 +1800,6 @@ int ieee80211_link_use_channel(struct ieee80211_link_data *link,

		lockdep_assert_held(&local->mtx);

		WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));

		mutex_lock(&local->chanctx_mtx);

		ret = cfg80211_chandef_dfs_required(local->hw.wiphy,
		@@ -1989,8 +1987,6 @@ void ieee80211_link_release_channel(struct ieee80211_link_data *link)
		{
		struct ieee80211_sub_if_data *sdata = link->sdata;

		WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev));

		mutex_lock(&sdata->local->chanctx_mtx);
		if (rcu_access_pointer(link->conf->chanctx_conf)) {
		lockdep_assert_held(&sdata->local->mtx);