From: Miri Korenblit Date: Tue, 5 May 2026 16:46:13 +0000 (+0300) Subject: wifi: cfg80211: don't allow NAN DATA on multi radio devices X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b9b2dd69b568172479ee6c9b680edd7b1b8f012;p=thirdparty%2Flinux.git wifi: cfg80211: don't allow NAN DATA on multi radio devices The support for NAN DATA was added for single radio devices only. For example, checking the interface combinations is done for a single radio. Prevent registration with NAN DATA interface type for multi radio devices. Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260505194607.ff87e6fcff56.If201aa58119d2a6b08223ecb63bc2869f63ff5a1@changeid Signed-off-by: Johannes Berg --- diff --git a/net/wireless/core.c b/net/wireless/core.c index 4dd1981a36296..62ab5e4639be1 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -882,7 +882,7 @@ int wiphy_register(struct wiphy *wiphy) return -EINVAL; if (WARN_ON((wiphy->interface_modes & BIT(NL80211_IFTYPE_NAN_DATA)) && - !wiphy->nan_capa.phy.ht.ht_supported)) + (!wiphy->nan_capa.phy.ht.ht_supported || wiphy->n_radio > 1))) return -EINVAL; if (WARN_ON(wiphy->interface_modes & BIT(NL80211_IFTYPE_WDS)))