Commit 21b78054 authored May 06, 2021 by Johannes Berg

cfg80211: remove CFG80211_MAX_NUM_DIFFERENT_CHANNELS

We no longer need to put any limits here, hardware will and
mac80211-hwsim can do whatever it likes. The reason we had
this was some accounting code (still mentioned in the comment)
but that code was deleted in commit c781944b ("cfg80211:
Remove unused cfg80211_can_use_iftype_chan()").

Link: https://lore.kernel.org/r/20210506221159.d1d61db1d31c.Iac4da68d54b9f1fdc18a03586bbe06aeb9515425@changeid

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 5eae2705

drivers/net/wireless/mac80211_hwsim.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -3796,11 +3796,6 @@ static int hwsim_new_radio_nl(struct sk_buff msg, struct genl_info info)
		return -EINVAL;
		}

		if (param.channels > CFG80211_MAX_NUM_DIFFERENT_CHANNELS) {
		GENL_SET_ERR_MSG(info, "too many channels specified");
		return -EINVAL;
		}

		if (info->attrs[HWSIM_ATTR_NO_VIF])
		param.no_vif = true;

include/net/cfg80211.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1245,8 +1245,6 @@ struct cfg80211_csa_settings {
		u8 count;
		};

		#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10

		/**
		* struct iface_combination_params - input parameters for interface combinations
		*

net/wireless/core.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -589,14 +589,6 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
		if (WARN_ON(!c->num_different_channels))
		return -EINVAL;

		/*
		* Put a sane limit on maximum number of different
		* channels to simplify channel accounting code.
		*/
		if (WARN_ON(c->num_different_channels >
		CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
		return -EINVAL;

		/* DFS only works on one channel. */
		if (WARN_ON(c->radar_detect_widths &&
		(c->num_different_channels > 1)))