[NOUPSTREAM] wifi: iwlwifi: mvm: remove IWLWIFI_NUM_CHANNELS

There is no more difference between chromeOS and Linux in this,
So it is not needed anymore.

type=maint
ticket=none

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Change-Id: Ie4b394f549493cc039a9f23684d7518114f1322f
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/108935
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
x-iwlwifi-stack-dev: 0e9afa99a599309bd7f10c584296516d26597bf6
diff --git a/defconfigs/iwlwifi-galileo b/defconfigs/iwlwifi-galileo
index 14e0b45..babe854 100644
--- a/defconfigs/iwlwifi-galileo
+++ b/defconfigs/iwlwifi-galileo
@@ -23,4 +23,3 @@
 CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES=y
 # CPTCFG_IWLWIFI_FORCE_OFDM_RATE is not set
 # CPTCFG_IWLMVM_P2P_UAPSD_STANDALONE is not set
-CPTCFG_IWLWIFI_NUM_CHANNELS=1
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
index c2bf25c..cfe9424 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
@@ -17,12 +17,6 @@
 	  Say Y if you have the user space application and want
 	  to execute debug and testing flows on the HW.
 
-config IWLWIFI_NUM_CHANNELS
-	int "number of supported concurrent channels"
-	range 1 2
-	default 2
-	depends on IWLMVM
-
 config IWLWIFI_THERMAL_DEBUGFS
 	bool "enable thermal debug write and read support"
 	depends on IWLWIFI_DEBUGFS
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index c91e9a5..e5cc69a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -57,7 +57,7 @@
 
 static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
 	{
-		.num_different_channels = CPTCFG_IWLWIFI_NUM_CHANNELS,
+		.num_different_channels = 2,
 		.max_interfaces = CPTCFG_IWLWIFI_NUM_STA_INTERFACES + 2,
 		.limits = iwl_mvm_limits,
 		.n_limits = ARRAY_SIZE(iwl_mvm_limits),
@@ -88,7 +88,7 @@
 static const struct ieee80211_iface_combination
 iwl_mvm_iface_combinations_nan[] = {
 	{
-		.num_different_channels = CPTCFG_IWLWIFI_NUM_CHANNELS,
+		.num_different_channels = 2,
 		.max_interfaces = CPTCFG_IWLWIFI_NUM_STA_INTERFACES + 3,
 		.limits = iwl_mvm_limits_nan,
 		.n_limits = ARRAY_SIZE(iwl_mvm_limits_nan),
diff --git a/local-symbols b/local-symbols
index 5e08bd8..2a826ad 100644
--- a/local-symbols
+++ b/local-symbols
@@ -82,7 +82,6 @@
 IWLWIFI_DEVICE_TESTMODE=
 IWLXVT=
 IWLWIFI_DBGM=
-IWLWIFI_NUM_CHANNELS=
 IWLWIFI_SUPPORT_DEBUG_OVERRIDES=
 IWLWIFI_THERMAL_DEBUGFS=
 IWLWIFI_FORCE_OFDM_RATE=
diff --git a/versions b/versions
index a194999..0065139 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12207:e784520c"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12208:0e9afa99"