wifi: cfg80211: allow only one NAN interface, also in multi radio

[ Upstream commit e69fda4d07701373354e52b0321bd40311d743d0 ]

According to Wi-Fi Aware (TM) 4.0 specification 2.8, A NAN device can
have one NAN management interface. This applies also to multi radio
devices.
The current code allows a driver to support more than one NAN interface,
if those are not in the same radio.

Fix it.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260107135129.fdaecec0fe8a.I246b5ba6e9da3ec1481ff197e47f6ce0793d7118@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/wireless/core.c b/net/wireless/core.c
index a04f96dc9a1d73c478c2ff045c7d2a9f823dc7aa..16ccf6fb28b2107bf6609edfec7fe93f908f6681 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -661,12 +661,8 @@ int wiphy_verify_iface_combinations(struct wiphy *wiphy,
                                    c->limits[j].max > 1))
                                return -EINVAL;
 
-                       /* Only a single NAN can be allowed, avoid this
-                        * check for multi-radio global combination, since it
-                        * hold the capabilities of all radio combinations.
-                        */
-                       if (!combined_radio &&
-                           WARN_ON(types & BIT(NL80211_IFTYPE_NAN) &&
+                       /* Only a single NAN can be allowed */
+                       if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) &&
                                    c->limits[j].max > 1))
                                return -EINVAL;