mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-19 21:31:10 +02:00
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
From d1d61db1d31cd5ef5c0420dad3e922c441cd89bc Mon Sep 17 00:00:00 2001
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Thu, 6 May 2021 22:10:38 +0200
|
|
Subject: [PATCH] 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()").
|
|
|
|
Change-Id: Iac4da68d54b9f1fdc18a03586bbe06aeb9515425
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
drivers/net/wireless/mac80211_hwsim.c | 5 -----
|
|
include/net/cfg80211.h | 2 --
|
|
net/wireless/core.c | 8 --------
|
|
3 files changed, 15 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
|
|
index fa7d4c20dc13..8fe42114d8d6 100644
|
|
--- a/drivers/net/wireless/mac80211_hwsim.c
|
|
+++ b/drivers/net/wireless/mac80211_hwsim.c
|
|
@@ -3791,11 +3791,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 394c4269901c..473d291b9017 100644
|
|
--- a/include/net/cfg80211.h
|
|
+++ b/include/net/cfg80211.h
|
|
@@ -1244,8 +1244,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 a2785379df6e..04b8fbae3943 100644
|
|
--- a/net/wireless/core.c
|
|
+++ b/net/wireless/core.c
|
|
@@ -576,14 +576,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)))
|
|
--
|
|
2.30.2
|
|
|