{"id":2198405,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2198405/?format=json","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.0/projects/22/?format=json","name":"HostAP Development","link_name":"hostap","list_id":"hostap.lists.infradead.org","list_email":"hostap@lists.infradead.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260219202514.5781-9-andrei.otcheretianski@intel.com>","date":"2026-02-19T20:24:24","name":"[08/58] NAN: Add a function to add device capability attribute","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f4e64e407a229e262db2845ed6004994f53522c3","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.0/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260219202514.5781-9-andrei.otcheretianski@intel.com/mbox/","series":[{"id":492721,"url":"http://patchwork.ozlabs.org/api/1.0/series/492721/?format=json","date":"2026-02-19T20:24:21","name":"NAN: Add NAN Data Path (NDP) support","version":1,"mbox":"http://patchwork.ozlabs.org/series/492721/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2198405/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ny88Dbp7;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=mWgIvHoB;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fH4f41ytHz1xpY\n\tfor ; Fri, 20 Feb 2026 07:26:20 +1100 (AEDT)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAb0-0000000Bvzx-0V7O;\n\tThu, 19 Feb 2026 20:25:58 +0000","from mgamail.intel.com ([198.175.65.10])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAax-0000000BvpR-09TN\n\tfor hostap@lists.infradead.org;\n\tThu, 19 Feb 2026 20:25:56 +0000","from orviesa004.jf.intel.com ([10.64.159.144])\n by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:25:55 -0800","from aotchere-mobl1.ger.corp.intel.com (HELO\n aotchere-mobl1.intel.com) ([10.245.246.171])\n by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:25:52 -0800"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=pToBobqVg1tZo7Pl7wu60K2rS0AjpldoSTmlMHBLV04=; b=ny88Dbp7oenyMk\n\tY+meshN/ljQUjQJwLeMC/sG5f8MQX3XY/oXuGDxPl05D5kmAN498uxVWExSf1TuRg/y45kh/INam4\n\t48353/QNPYvwhgCkTnIBs9oAGBQDNaEMZp8TssUdAagc6Y1GDhsrZEix0+5j3DlLaHlAojytyH2bv\n\tq3/dwx1xvHiI8pgDy96HvELmzfwN+PmkdD64piMSi8SxBajeSsXJhAmB5uvzq6enyGAjYD0smlJf1\n\tc39gT/EqvvcfPVYf+BQRXSm34aWRTgzh7FTpIAqRYqJPJaY8mSvwhKNfQlNOKaTrhkFPDR5wYOPhS\n\tlr1BrbdMoO02TF4+2RfQ==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1771532755; x=1803068755;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=EPUgplWAQ0jbrFUHLYtKPcnGg+tYoxyJl+UISus7ZAM=;\n b=mWgIvHoBbksQ5nv8615F+YQOAIjJND00YkF+iuv/SppsM8aOioUVWFw2\n oMWymzhVtIE3DXBwLVoL7p3m3IznHDLlvwVB4ZlBCSnxTxCd57CED1CR7\n 7jlnGAUi/EuYXnNDs4iifSNBGoMb0dAbb8/kvWO9NuPe8cKybEHrG8+N/\n w3DO51+grslQRZTMsjTVbe8JLIhsYJ2xo5Qtb0Mldhe6eKUFboVS7w6/i\n hz+8jVVzH3QJNkZaL1afmjhQtuea9QUrK4QB3Hgq76ZVyUyg+4mUvl8wO\n DiUfEwOSV4rMndm/VF6A4b8Q50MWv4YmhPWp+g7XSTDvPcV43LPGV4KBn\n w==;"],"X-CSE-ConnectionGUID":["ZBENWpT5SUegXixa+RgT2Q==","wSqWKUTYSsKSloBKjSzMrA=="],"X-CSE-MsgGUID":["7qbVPODeR1yIQ1nO7KCaaA==","uAZsPdLuQbS994S2r6r2wA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11706\"; a=\"90039943\"","E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"90039943\"","E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"219153721\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org,\n\tvamsin@qti.qualcomm.com,\n\tvganneva@qti.qualcomm.com,\n\tmaheshkkv@google.com","Cc":"Ilan Peer ","Subject":"[PATCH 08/58] NAN: Add a function to add device capability attribute","Date":"Thu, 19 Feb 2026 22:24:24 +0200","Message-ID":"<20260219202514.5781-9-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260219202514.5781-1-andrei.otcheretianski@intel.com>","References":"<20260219202514.5781-1-andrei.otcheretianski@intel.com>","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20260219_122555_149489_8B9305E0 ","X-CRM114-Status":"GOOD ( 15.01 )","X-Spam-Score":"-4.4 (----)","X-Spam-Report":"Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: Ilan Peer Signed-off-by: Ilan\n Peer --- src/nan/nan.h | 21 +++++++++++++++++++++\n src/nan/nan_i.h\n | 1 + src/nan/nan_util.c | 22 ++++++++++++++++++++++\n wpa_supplicant/nan_supplicant.c\n | 20 ++ [...]\n Content analysis details: (-4.4 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,\n medium trust\n [198.175.65.10 listed in list.dnswl.org]\n 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in sa-accredit.habeas.com]\n 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The\n query to Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in\n sa-trusted.bondedsender.org]\n 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to\n Validity was blocked. See\n https://knowledge.validity.com/hc/en-us/articles/20961730681243\n for more information.\n [198.175.65.10 listed in\n bl.score.senderscore.com]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender","X-BeenThere":"hostap@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Hostap\" ","Errors-To":"hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"From: Ilan Peer \n\nSigned-off-by: Ilan Peer \n---\n src/nan/nan.h | 21 +++++++++++++++++++++\n src/nan/nan_i.h | 1 +\n src/nan/nan_util.c | 22 ++++++++++++++++++++++\n wpa_supplicant/nan_supplicant.c | 20 ++++++++++++++++++++\n 4 files changed, 64 insertions(+)","diff":"diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex ca30e403c2..198441bed8 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -11,9 +11,30 @@\n \n struct nan_cluster_config;\n \n+/*\n+ * struct nan_device_capabilities - NAN device capabilities.\n+ *\n+ * @cdw_info: Committed DW information\n+ * @supported_bands: Supported bands\n+ * @op_mode: Operation mode\n+ * @n_antennas: Number of antennas\n+ * @channel_switch_time: Maximal channel switch time\n+ * @capa: Device capabilities\n+ */\n+struct nan_device_capabilities {\n+\tu16 cdw_info;\n+\tu8 supported_bands;\n+\tu8 op_mode;\n+\tu8 n_antennas;\n+\tu16 channel_switch_time;\n+\tu8 capa;\n+};\n+\n struct nan_config {\n \tvoid *cb_ctx;\n \n+\tstruct nan_device_capabilities dev_capa;\n+\n \t/**\n \t * start - Start NAN\n \t * @ctx: Callback context from cb_ctx\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 5cf2bf80eb..fab724aaa2 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -89,5 +89,6 @@ int nan_parse_attrs(struct nan_data *nan, const u8 *data, size_t len,\n int nan_parse_naf(struct nan_data *nan, const struct ieee80211_mgmt *mgmt,\n \t\t size_t len, struct nan_msg *msg);\n void nan_attrs_clear(struct nan_data *nan, struct nan_attrs *attrs);\n+void nan_add_dev_capa_attr(struct nan_data *nan, struct wpabuf *buf);\n \n #endif /* NAN_I_H */\ndiff --git a/src/nan/nan_util.c b/src/nan/nan_util.c\nindex 7e8d27f9c7..f9390b14f5 100644\n--- a/src/nan/nan_util.c\n+++ b/src/nan/nan_util.c\n@@ -317,3 +317,25 @@ int nan_parse_naf(struct nan_data *nan, const struct ieee80211_mgmt *mgmt,\n \t\t\t len - IEEE80211_MIN_ACTION_LEN(naf),\n \t\t\t &msg->attrs);\n }\n+\n+\n+/*\n+ * nan_add_dev_capa_attr - Add NAN device capability attribute\n+ *\n+ * @nan: NAN module context from nan_init()\n+ * @buf: wpabuf to which the attribute would be added\n+ */\n+void nan_add_dev_capa_attr(struct nan_data *nan, struct wpabuf *buf)\n+{\n+\twpabuf_put_u8(buf, NAN_ATTR_DEVICE_CAPABILITY);\n+\twpabuf_put_le16(buf, sizeof(struct nan_device_capa));\n+\n+\t/* Device capabilities apply to the device, so set map ID = 0 */\n+\twpabuf_put_u8(buf, 0);\n+\twpabuf_put_le16(buf, nan->cfg->dev_capa.cdw_info);\n+\twpabuf_put_u8(buf, nan->cfg->dev_capa.supported_bands);\n+\twpabuf_put_u8(buf, nan->cfg->dev_capa.op_mode);\n+\twpabuf_put_u8(buf, nan->cfg->dev_capa.n_antennas);\n+\twpabuf_put_le16(buf, nan->cfg->dev_capa.channel_switch_time);\n+\twpabuf_put_u8(buf, nan->cfg->dev_capa.capa);\n+}\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 87cb5b4943..b47fe97ff8 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -80,6 +80,26 @@ int wpas_nan_init(struct wpa_supplicant *wpa_s)\n \tnan.stop = wpas_nan_stop_cb;\n \tnan.update_config = wpas_nan_update_config_cb;\n \n+\t/*\n+\t * TODO: Set the device capabilities based on configuration and driver\n+\t * data. For now do not set 'n_antennas', 'channel_switch_time' and\n+\t * 'capa', i.e., indicating that the information is not available. This\n+\t * information should also be retrieved from the driver.\n+\t */\n+\tnan.dev_capa.cdw_info =\n+\t\t((1 << NAN_CDW_INFO_2G_POS) & NAN_CDW_INFO_2G_MASK) |\n+\t\t((1 << NAN_CDW_INFO_5G_POS) & NAN_CDW_INFO_5G_MASK);\n+\n+\tnan.dev_capa.supported_bands = NAN_DEV_CAPA_SBAND_2G;\n+\tif (wpa_s->nan_drv_flags &\n+\t WPA_DRIVER_FLAGS_NAN_SUPPORT_DUAL_BAND)\n+\t\tnan.dev_capa.supported_bands |= NAN_DEV_CAPA_SBAND_5G;\n+\n+\t/* TODO: set based on driver capabilities */\n+\tnan.dev_capa.op_mode = NAN_DEV_CAPA_OP_MODE_PHY_MODE_VHT |\n+\t\tNAN_DEV_CAPA_OP_MODE_PHY_MODE_HE |\n+\t\tNAN_DEV_CAPA_OP_MODE_HE_VHT_160;\n+\n \twpa_s->nan = nan_init(&nan);\n \tif (!wpa_s->nan) {\n \t\twpa_printf(MSG_INFO, \"NAN: Failed to init\");\n","prefixes":["08/58"]}