From: Ilan Peer <ilan.peer@intel.com>
Date: Mon, 8 Sep 2025 11:13:01 +0000 (+0300)
Subject: wifi: cfg80211: Store the NAN cluster ID
X-Git-Tag: v6.18-rc1~132^2~56^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1884e2594b084a6b1eb438e5eda586f284d80fee;p=thirdparty%2Flinux.git

wifi: cfg80211: Store the NAN cluster ID

When the driver indicates that the device has joined
a cluster, store the cluster ID. This is needed for data
path operations, e.g., filtering received frames etc.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250908140015.63e9fef2a3aa.I6c858185c9e71f84bd2c5174d7ee45902b4391c3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e30c1886c5304..26fd42e189ce2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -6681,6 +6681,9 @@ struct wireless_dev {
 		struct {
 			struct cfg80211_chan_def chandef;
 		} ocb;
+		struct {
+			u8 cluster_id[ETH_ALEN] __aligned(2);
+		} nan;
 	} u;
 
 	struct {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 72f68a17c92be..4e0d40865441c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -21865,6 +21865,8 @@ void cfg80211_nan_cluster_joined(struct wireless_dev *wdev,
 
 	trace_cfg80211_nan_cluster_joined(wdev, cluster_id, new_cluster);
 
+	memcpy(wdev->u.nan.cluster_id, cluster_id, ETH_ALEN);
+
 	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
 	if (!msg)
 		return;