{"id":2226425,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2226425/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-76-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422122424.43776-76-andrei.otcheretianski@intel.com>","list_archive_url":null,"date":"2026-04-22T12:24:06","name":"[75/92] NAN: Prepare module tests for NAF transmitted over NDIs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4723fa49f2842a44bf6faec7582296a7bf9cd53d","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.2/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-76-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501001,"url":"http://patchwork.ozlabs.org/api/1.2/series/501001/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/list/?series=501001","date":"2026-04-22T12:23:05","name":"Add NAN PASN pairing support","version":1,"mbox":"http://patchwork.ozlabs.org/series/501001/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226425/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226425/checks/","tags":{},"related":[],"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=yRscZ4MA;\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=AAs9Tcnp;\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 4g0z9M4Kn5z1y2d\n\tfor ; Wed, 22 Apr 2026 22:31:19 +1000 (AEST)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWj8-0000000AAY4-1a99;\n\tWed, 22 Apr 2026 12:30:46 +0000","from mgamail.intel.com ([192.198.163.17])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWff-0000000A34C-06Jl\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:27:20 +0000","from orviesa010.jf.intel.com ([10.64.159.150])\n by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:26:36 -0700","from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:26:36 -0700"],"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=jVvzrnTEgqXaRMDEhy+hBwtA/Bm20s0LkerMDn9I0s4=; b=yRscZ4MA5Hq5xn\n\tqwe8PgzqxfXfbCW8ABfz6HpnQDpA/pINdphCfzN9pKwr98oRCG9wTJTslxztHHdy7ZoRcYG67n4FH\n\tWmbgjHMHqCR4Wblf/ACmdhSn8o1fOt0UPwpW7jESoqnOTcBCrR8L26YJiVu/NVd/5rUb0Uy0y6rJ3\n\tSB7D2NVmK45xcKeBlJqjL1RfiVE/51lBut+bTf1+VEZJtPWdRjvCpjGexjepsgSivFcxZNoM0ks9J\n\tJPqz7nZIIfIxSkJKBL6259urwGdE2xuJGGVQgCJxi7IpR05pcJrRzjFeuc/uLdW0tvpwefCRatL1h\n\tluWKEdyOR2/XFzrMSH+A==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860831; x=1808396831;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=QPsoRGECkF+pBDv3erUrJYONeAoHHRzx6XYkLlTPibE=;\n b=AAs9TcnpCpJj3v/l1m/EP14ijAOgCzYM8mXokrJfgFdooxI6lWJEpyNJ\n wvMvH7/WK1xqlAfi4r+E+nTlmOWcUidf5lrnOB0TIJTZ0NNgJVHWQM+OO\n J24jS857/5JmSAkunzaKpeFBW56D01FcDwdYeBZTWwGiGl9iREIWql+rs\n fmyyl11QDAJs+TafOKPIwz/iidnimGr5bZ+uqSj0Hlyaut53Q4YXXAFm6\n 1HJzvk2p+5aBvGFM83ylvq6zIK2kh0qpbf+zaQa7hk8wwLxF1r0Mx9QJL\n e28X+cO5Dz8np9P9tvHXckQPBarjxFuXbLMpA4bTx0I1L3GAnfiPOyme9\n A==;"],"X-CSE-ConnectionGUID":["6W+c5IegRXGtjI6EiTaRBA==","C+X+HNVxSluiFwOBACdRFA=="],"X-CSE-MsgGUID":["+comBNsaQIKXsxDJpAbKRA==","HzhOM3bJTFyP0JlsvcBHKA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11764\"; a=\"77687550\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687550\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445272\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Cc":"vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tIlan Peer ","Subject":"[PATCH 75/92] NAN: Prepare module tests for NAF transmitted over NDIs","Date":"Wed, 22 Apr 2026 15:24:06 +0300","Message-ID":"<20260422122424.43776-76-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260422122424.43776-1-andrei.otcheretianski@intel.com>","References":"<20260422122424.43776-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-20260422_052711_302258_D312181F ","X-CRM114-Status":"GOOD ( 14.23 )","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 Prepare the NAN\n module\n testing to also allow transmissions of NAFs over NDIs, as a preparation to\n support NAF transmissions over NDI once a secure NDP is established.\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 [192.198.163.17 listed in list.dnswl.org]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\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_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\nPrepare the NAN module testing to also allow transmissions\nof NAFs over NDIs, as a preparation to support NAF\ntransmissions over NDI once a secure NDP is established.\n\nSigned-off-by: Ilan Peer \n---\n src/nan/nan_module_tests.c | 36 ++++++++++++++++++++----------------\n src/nan/nan_module_tests.h | 2 ++\n 2 files changed, 22 insertions(+), 16 deletions(-)","diff":"diff --git a/src/nan/nan_module_tests.c b/src/nan/nan_module_tests.c\nindex f04aba1c68..7181729500 100644\n--- a/src/nan/nan_module_tests.c\n+++ b/src/nan/nan_module_tests.c\n@@ -23,10 +23,10 @@\n #define NAN_TEST_MAX_LATENCY 3\n #define NAN_TEST_PUBLISH_INST_ID 12\n \n-static const u8 pub_nmi[] = { 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA };\n-static const u8 pub_ndi[] = { 0x00, 0xAA, 0xAA, 0x00, 0x00, 0x00 };\n-static const u8 sub_nmi[] = { 0x00, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB };\n-static const u8 sub_ndi[] = { 0x00, 0xBB, 0xBB, 0xBB, 0x00, 0x00 };\n+static const u8 g_pub_nmi[] = { 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA };\n+static const u8 g_pub_ndi[] = { 0x00, 0xAA, 0xAA, 0x00, 0x00, 0x00 };\n+static const u8 g_sub_nmi[] = { 0x00, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB };\n+static const u8 g_sub_ndi[] = { 0x00, 0xBB, 0xBB, 0xBB, 0x00, 0x00 };\n \n /**\n * struct nan_test_action - NAN test action context\n@@ -375,7 +375,7 @@ static int nan_ndp_notify_action(struct nan_device *dev, void *ctx)\n \t\t\twpa_printf(MSG_INFO, \"%s: Accepting request\",\n \t\t\t\t dev->name);\n \n-\t\t\tos_memcpy(params->u.resp.resp_ndi, pub_ndi, ETH_ALEN);\n+\t\t\tos_memcpy(params->u.resp.resp_ndi, dev->ndi, ETH_ALEN);\n \t\t\tparams->u.resp.status = NAN_NDP_STATUS_ACCEPTED;\n \t\t\tdev->conf->schedule_cb(¶ms->sched);\n \t\t\tparams->sched.elems = dev->global->elems;\n@@ -421,7 +421,7 @@ static int nan_ndp_notify_action(struct nan_device *dev, void *ctx)\n \t\t\twpa_printf(MSG_INFO, \"%s: Accepting response\",\n \t\t\t\t dev->name);\n \n-\t\t\tos_memcpy(params->u.resp.resp_ndi, sub_ndi, ETH_ALEN);\n+\t\t\tos_memcpy(params->u.resp.resp_ndi, dev->ndi, ETH_ALEN);\n \t\t\tparams->u.resp.status = NAN_NDP_STATUS_ACCEPTED;\n \n \t\t\tif (!dev->conf->schedule_conf_cb) {\n@@ -739,7 +739,8 @@ static int nan_test_send_naf_cb(void *ctx, const u8 *dst, const u8 *src,\n \t\t MAC2STR(dst));\n \n \tdl_list_for_each(curd, &dev->global->devs, struct nan_device, list) {\n-\t\tif (ether_addr_equal(curd->nmi, dst)) {\n+\t\tif (ether_addr_equal(curd->nmi, dst) ||\n+\t\t ether_addr_equal(curd->ndi, dst)) {\n \t\t\tfound = true;\n \t\t\tbreak;\n \t\t}\n@@ -931,12 +932,14 @@ static int nan_test_dev_init(struct nan_device *dev)\n * @global: NAN test global data structure\n * @name: Name of the device\n * @nmi: NAN Management interface address\n+ * @ndi: NAN Data interface address\n * @cconf: NAN cluster configuration\n * @dconf: Test device configuration\n */\n static struct nan_device *\n nan_test_start_dev(struct nan_test_global *global,\n \t\t const char *name, const u8 *nmi,\n+\t\t const u8 *ndi,\n \t\t struct nan_cluster_config *conf,\n \t\t const struct nan_test_dev_conf *dconf)\n {\n@@ -953,6 +956,7 @@ nan_test_start_dev(struct nan_test_global *global,\n \t\tnlen = sizeof(dev->name) - 1;\n \tos_memcpy(dev->name, name, nlen);\n \tos_memcpy(dev->nmi, nmi, sizeof(dev->nmi));\n+\tos_memcpy(dev->ndi, ndi, sizeof(dev->ndi));\n \tdl_list_init(&dev->list);\n \tdev->global = global;\n \n@@ -1023,18 +1027,18 @@ nan_test_setup_devices(struct nan_test_global *global,\n \n \twpa_printf(MSG_INFO, \"%s: Enter\\n\", __func__);\n \n-\tpub = nan_test_start_dev(global, \"publisher\", pub_nmi, &cconf,\n-\t\t\t\t pub_conf);\n+\tpub = nan_test_start_dev(global, \"publisher\", g_pub_nmi, g_pub_ndi,\n+\t\t\t\t &cconf, pub_conf);\n \tif (!pub)\n \t\tgoto fail;\n \n-\tsub = nan_test_start_dev(global, \"subscriber\", sub_nmi, &cconf,\n-\t\t\t\t sub_conf);\n+\tsub = nan_test_start_dev(global, \"subscriber\", g_sub_nmi, g_sub_ndi,\n+\t\t\t\t &cconf, sub_conf);\n \tif (!sub)\n \t\tgoto fail;\n \n-\tnan_add_peer(pub->nan, sub_nmi, attrs, sizeof(attrs));\n-\tnan_add_peer(sub->nan, pub_nmi, attrs, sizeof(attrs));\n+\tnan_add_peer(pub->nan, g_sub_nmi, attrs, sizeof(attrs));\n+\tnan_add_peer(sub->nan, g_pub_nmi, attrs, sizeof(attrs));\n \n \twpa_printf(MSG_INFO, \"\\n%s: Done\\n\", __func__);\n \treturn sub;\n@@ -1045,7 +1049,7 @@ fail:\n }\n \n \n-static int nan_test_ndp_request(struct nan_device *sub)\n+static int nan_test_ndp_request(struct nan_device *sub, const u8 *pub_nmi)\n {\n \tstruct nan_ndp_params *params;\n \tstruct nan_test_action *action;\n@@ -1060,7 +1064,7 @@ static int nan_test_ndp_request(struct nan_device *sub)\n \n \tparams->type = NAN_NDP_ACTION_REQ;\n \tos_memcpy(params->ndp_id.peer_nmi, pub_nmi, ETH_ALEN);\n-\tos_memcpy(params->ndp_id.init_ndi, sub_ndi, ETH_ALEN);\n+\tos_memcpy(params->ndp_id.init_ndi, sub->ndi, ETH_ALEN);\n \tparams->ndp_id.id = ++sub->counter;\n \tparams->qos.min_slots = NAN_TEST_MIN_SLOTS;\n \tparams->qos.max_latency = NAN_TEST_MAX_LATENCY;\n@@ -1219,7 +1223,7 @@ static int nan_test_run(void)\n \t\t}\n \n \t\tfor (i = 0; i < sub->conf->n_ndps; i++) {\n-\t\t\tint ret = nan_test_ndp_request(sub);\n+\t\t\tint ret = nan_test_ndp_request(sub, g_pub_nmi);\n \n \t\t\tif (!ret)\n \t\t\t\tret = nan_test_run_actions(&global);\ndiff --git a/src/nan/nan_module_tests.h b/src/nan/nan_module_tests.h\nindex ecd0f626e1..dd6fa4b22f 100644\n--- a/src/nan/nan_module_tests.h\n+++ b/src/nan/nan_module_tests.h\n@@ -80,6 +80,7 @@ struct nan_test_dev_conf {\n * @global: Pointer to NAN test global data structure\n * @name: Test device name\n * @nmi: Test device NMI\n+ * @ndi: Test device NDI\n * @counter: Device counter for NDP various purposes\n * @pot_avail: Device potential availability\n * @pot_avail_len: Length of the device potential availability\n@@ -100,6 +101,7 @@ struct nan_device {\n \n \tu8 name[NAN_TEST_NAME_MAX];\n \tu8 nmi[ETH_ALEN];\n+\tu8 ndi[ETH_ALEN];\n \tu32 counter;\n \n \tu8 *pot_avail;\n","prefixes":["75/92"]}