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 c781944b71f8 ("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>

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 7a6fd46d0c6e8f135e79fc6004d08b40ea2527ca..9574afc0cdbf1619c2bccd437665da9a6b3dcbe7 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -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;
 

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 58c2cd417e89ae469a7f46b0e93ce4b1a17c822a..60325b62daae7afd81388be1f8046f1e550c83a6 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -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
  *

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 8d0883e8109343d346013d72c66d439cdf99fcd2..47f55130159231d5ddb706d22caee1c8b7a7e2fd 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -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)))