From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A2E6480331; Sat, 28 Feb 2026 17:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300257; cv=none; b=dqFgNVfATGyXjUQx9/S7q+PHl0zMyir9DzL3zaFppUef6LxCnz83AcQLY4oHM/EeTcAQwrgDSCWNxk3zodg3yv3nWU1xE4a0PpuARii6QdvANL3slxrIv9GWQoDGbUEiUB48g8LyEs/o6CxNIraH5xd/jTeMM8syuAEKnjvgviA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300257; c=relaxed/simple; bh=S+vAKVZSypWTg0uCfcPyfYz9RZ+EQOAVcvk32yYo9cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sKn/71VL0qiDkgcrn4wshWeotxVNSZOz4tFwXAPM0jwPjQczWTa+TisHswmc+x+4Cn3C6Ywb+C/4K4jUQMjTweAQt6VHTZaxQEDR4vCZTQOUMHPQmDWDhiKF7QTyB5yrJHssH7B3xUe8t/yCiFoNtO7RUTZ4AcoJ88nwNY1pr7A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=epxD7boY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="epxD7boY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FFCEC19424; Sat, 28 Feb 2026 17:37:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300257; bh=S+vAKVZSypWTg0uCfcPyfYz9RZ+EQOAVcvk32yYo9cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=epxD7boYJe050N2t3OkFg+OV/iCg59y7ilpXlwNe9ny05VWsxFPSVF4j5Rv/T65Lq RiP8zc3yThjh7Ut5Uu0Yi3sHUOzXlrfPy9CcaMPSI+i7XoPlUSl3UaGJV86ZlVlslo c3L2dBNydZyY6kr7ZJ+SWLAM7rT4z5h+qMJVKLjBWN+EAHkZ2JsiNMNzLNShzvbyu0 FAfZzKj+TS/3Mf4Cw2dsBAFXgN2WLfQCSAFFjelVduod32YsDp+tsw9Lt+xfNoE6gn t3VFrBIg9wprCfxakaiYUJdhUYZ+h+T4lN1f+nSJOXyHEc7JtNgjHmtsX8mRx1vBPG IgYOalBna5hcg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.19 282/844] wifi: cfg80211: allow only one NAN interface, also in multi radio Date: Sat, 28 Feb 2026 12:23:15 -0500 Message-ID: <20260228173244.1509663-283-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Miri Korenblit [ 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 Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20260107135129.fdaecec0fe8a.I246b5ba6e9da3ec1481ff197e47f6ce0793d7118@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index a04f96dc9a1d7..16ccf6fb28b21 100644 --- 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; -- 2.51.0