]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: iwlwifi: mvm: fix interface combinations
authorJohannes Berg <johannes.berg@intel.com>
Tue, 2 Jul 2024 11:00:00 +0000 (13:00 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 4 Jul 2024 11:49:03 +0000 (13:49 +0200)
The NAN code referenced in this commit isn't actually
present in the driver (any more), and the commit didn't
add the extra NAN entry. Thus, the -1 is incorrect.

Reported-by: Alexander Wetzel <Alexander@wetzel-home.de>
Closes: https://lore.kernel.org/20240702104128.26394-1-Alexander@wetzel-home.de
Fixes: 5c38bedac16a ("wifi: iwlwifi: mvm: unify and fix interface combinations")
Link: https://patch.msgid.link/20240702130001.8c871a3f0b5a.I08a6542f52f63c5bd66bf3feb09e1998ce7c60e5@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

index 60bfe42d53864072759da515b947a4d7a3d6d19d..e40f993b17fd507e311e25e50d42c35940b28853 100644 (file)
@@ -59,13 +59,13 @@ static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
                .num_different_channels = 2,
                .max_interfaces = 3,
                .limits = iwl_mvm_limits,
-               .n_limits = ARRAY_SIZE(iwl_mvm_limits) - 1,
+               .n_limits = ARRAY_SIZE(iwl_mvm_limits),
        },
        {
                .num_different_channels = 1,
                .max_interfaces = 3,
                .limits = iwl_mvm_limits_ap,
-               .n_limits = ARRAY_SIZE(iwl_mvm_limits_ap) - 1,
+               .n_limits = ARRAY_SIZE(iwl_mvm_limits_ap),
        },
 };