{"id":2218826,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218826/?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":"<20260401220220.4418-38-andrei.otcheretianski@intel.com>","date":"2026-04-01T22:01:46","name":"[37/71] NAN: Add an API to convert nan_sched_chan struct to channel entry","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"81a64975f68e741a7aba429c5485d5a2a84b457d","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/20260401220220.4418-38-andrei.otcheretianski@intel.com/mbox/","series":[{"id":498402,"url":"http://patchwork.ozlabs.org/api/1.0/series/498402/?format=json","date":"2026-04-01T22:01:09","name":"NAN Data Path and Bootstrapping support","version":1,"mbox":"http://patchwork.ozlabs.org/series/498402/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2218826/checks/","tags":{},"headers":{"Return-Path":"\n <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>","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=O25YH2tN;\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=IxKdYgAZ;\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 4fmJyS4vHjz1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:08:00 +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 1w83id-0000000GCW1-0J8M;\n\tWed, 01 Apr 2026 22:07:23 +0000","from mgamail.intel.com ([198.175.65.20])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hF-0000000G9s8-14LK\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:01 +0000","from fmviesa003.fm.intel.com ([10.60.135.143])\n  by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:52 -0700","from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n  by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:51 -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:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=KkXMkiIdtZ/y3xPnuiPl4KF8AX1l7scnjT0RbREhl8k=; b=O25YH2tNLgAz0c\n\tpXWSJxeqY3XAcGOnbWccItmAjgxhW7FaPPIHglIZOm0Tz4LZt2rPWVEaPoE+nDAv1QNVheejTQ+UC\n\tJKP/gaFJ2Ngr4WkKVSEb/J4w/O2ZipZJffkWEiw2pkvY3g+5fB6B5j8Y/TgL6scKs2lKSyB2rBDSO\n\t8eybZYv5aBJJ/mZSfu7M5XAlk4VUgKBWdWNlQtE6K3XWTgQw6mxc8FNEpiFRVlwKfIF+faCE735Qx\n\tfJVks9JQHkxWKWKsXTvayGlG2jFpZlXGwXNogCWZp5c5SrcGq+/07WxZNO/KXZu31vBe2TGXVKCx9\n\t9epe38b9mpRRj6ZIJ6nw==;","v=1; a=rsa-sha256; c=relaxed/simple;\n  d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n  t=1775081157; x=1806617157;\n  h=from:to:subject:date:message-id:in-reply-to:references:\n   mime-version:content-transfer-encoding;\n  bh=8EicguIhqru6iQPOsRQQiEPZncYyC1GWxrjJnUW/ZLM=;\n  b=IxKdYgAZPNIrAcprG1874ie2f0Ja1XzLrfAbL3arNsxWgwx2RIBIRbk+\n   B3savXVMKx9zrAFQeRGlcHNupCWh1lL/aSsCS8NzWWMGso803QD3kasJq\n   EmH8bwZukIFp5RoaoqmN/ES5C1Cu+/gOA6Thxw7dCqqE5poxKdwYVsF2r\n   5NkiggNlv/S1b/hfRelq2q++ABxJXI7VFizwCcEOCdr+j3SJvB2n5PRYm\n   8EW+dyxUL5aFFDiCyv9NJM9mubVsQAY/YCHwHZpF77UVojkOEA5deJZnW\n   lNfAz03+n8/iU57f4SvTowtqAUOq68WHoZPFbebnXt3QwDgF7WXDnjrEx\n   g==;"],"X-CSE-ConnectionGUID":["YDSN61zQTMmN5GbJUpCsoQ==","wlKpR9dWThCM2rweZaEsLg=="],"X-CSE-MsgGUID":["bWCabRTLQEqRAca1nbV+cg==","6hOszv9RRp+BzrOKm0Z3Jw=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11746\"; a=\"75851627\"","E=Sophos;i=\"6.23,153,1770624000\";\n   d=\"scan'208\";a=\"75851627\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski <andrei.otcheretianski@intel.com>","To":"hostap@lists.infradead.org","Subject":"[PATCH 37/71] NAN: Add an API to convert nan_sched_chan struct to\n channel entry","Date":"Thu,  2 Apr 2026 01:01:46 +0300","Message-ID":"<20260401220220.4418-38-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260401220220.4418-1-andrei.otcheretianski@intel.com>","References":"<20260401220220.4418-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-20260401_150557_427945_487F3AC9 ","X-CRM114-Status":"GOOD (  12.25  )","X-Spam-Score":"-1.9 (-)","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:  Convert channel information into 6 byte channel entry\n format\n    as described in Wi-Fi Aware 4.0 specification table 100. Signed-off-by:\n Andrei\n    Otcheretianski <andrei.otcheretianski@intel.com> --- src/nan/nan.h | 2 ++\n    src/nan/nan_i.h | 2 +- src/nan/nan_util.c | 32\n +++++++++++++++++++++++++++++++-\n    3 files changed, 34 inse [...]\n Content analysis details:   (-1.9 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.20 listed in list.dnswl.org]\n  1.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.20 listed in\n bl.score.senderscore.com]\n  1.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.20 listed in\n sa-trusted.bondedsender.org]\n  1.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.20 listed in sa-accredit.habeas.com]\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_SIGNED            Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID_EF          Message has a valid DKIM or DK signature from\n                             envelope-from domain\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             Message has at least one valid DKIM or DK\n signature\n -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%\n                             [score: 0.0000]\n -0.5 DKIMWL_WL_HIGH         DKIMwl.org - High trust sender","X-BeenThere":"hostap@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"<hostap.lists.infradead.org>","List-Unsubscribe":"<http://lists.infradead.org/mailman/options/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=unsubscribe>","List-Archive":"<http://lists.infradead.org/pipermail/hostap/>","List-Post":"<mailto:hostap@lists.infradead.org>","List-Help":"<mailto:hostap-request@lists.infradead.org?subject=help>","List-Subscribe":"<http://lists.infradead.org/mailman/listinfo/hostap>,\n <mailto:hostap-request@lists.infradead.org?subject=subscribe>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Hostap\" <hostap-bounces@lists.infradead.org>","Errors-To":"hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Convert channel information into 6 byte channel entry format as\ndescribed in Wi-Fi Aware 4.0 specification table 100.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n src/nan/nan.h      |  2 ++\n src/nan/nan_i.h    |  2 +-\n src/nan/nan_util.c | 32 +++++++++++++++++++++++++++++++-\n 3 files changed, 34 insertions(+), 2 deletions(-)","diff":"diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 1906d2eed2..d78c8fa264 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -564,5 +564,7 @@ int nan_crypto_derive_nd_pmk(const char *pwd, const u8 *service_id,\n \t\t\t     const u8 *peer_nmi, u8 *nd_pmk);\n void nan_add_dev_capa_attr(struct nan_data *nan, struct wpabuf *buf);\n int nan_peer_del_all_ndps(struct nan_data *nan, const u8 *addr);\n+int nan_get_chan_entry(struct nan_data *nan, const struct nan_sched_chan *chan,\n+\t\t       struct nan_chan_entry *chan_entry);\n \n #endif /* NAN_H */\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 701d98f773..ef062c08b1 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -569,7 +569,7 @@ void nan_ndl_add_elem_container_attr(const struct nan_data *nan,\n \t\t\t\t     struct wpabuf *buf);\n bool nan_ndl_peer_schedule_intersects(struct nan_data *nan,\n \t\t\t\t      struct nan_peer *peer);\n-int nan_get_chan_bm(struct nan_data *nan, struct nan_sched_chan *chan,\n+int nan_get_chan_bm(struct nan_data *nan, const struct nan_sched_chan *chan,\n \t\t    u8 *op_class, u16 *chan_bm, u16 *pri_chan_bm);\n int nan_add_avail_attrs(struct nan_data *nan, u8 sequence_id,\n \t\t\tu32 map_ids_bitmap, u8 type_for_conditional,\ndiff --git a/src/nan/nan_util.c b/src/nan/nan_util.c\nindex bf6acc4a80..05630464d6 100644\n--- a/src/nan/nan_util.c\n+++ b/src/nan/nan_util.c\n@@ -480,7 +480,7 @@ static u16 nan_add_avail_entry(struct nan_data *nan,\n }\n \n \n-int nan_get_chan_bm(struct nan_data *nan, struct nan_sched_chan *chan,\n+int nan_get_chan_bm(struct nan_data *nan, const struct nan_sched_chan *chan,\n \t\t    u8 *op_class, u16 *chan_bm, u16 *pri_chan_bm)\n {\n \tu8 channel;\n@@ -1732,3 +1732,33 @@ int nan_get_peer_ndc_freq(struct nan_data *nan ,\n \tbitfield_free(ndc_bf);\n \treturn -1;\n }\n+\n+/**\n+ * nan_get_chan_entry - Get channel entry for a given NAN scheduled channel\n+ *\n+ * @nan: NAN module context from nan_init()\n+ * @chan: NAN scheduled channel\n+ * @chan_entry: On successful return holds the channel entry.\n+ * Returns 0 on success; otherwise -1\n+ */\n+int nan_get_chan_entry(struct nan_data *nan, const struct nan_sched_chan *chan,\n+\t\t       struct nan_chan_entry *chan_entry)\n+{\n+\tu8 op_class;\n+\tu16 chan_bm, pri_chan_bm;\n+\tint ret;\n+\n+\tif (!chan || !chan_entry)\n+\t\treturn -1;\n+\n+\tret = nan_get_chan_bm(nan, chan, &op_class, &chan_bm, &pri_chan_bm);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tos_memset(chan_entry, 0, sizeof(*chan_entry));\n+\tchan_entry->op_class = op_class;\n+\tchan_entry->chan_bitmap = host_to_le16(chan_bm);\n+\tchan_entry->pri_chan_bitmap = pri_chan_bm & 0xff;\n+\n+\treturn 0;\n+}\n","prefixes":["37/71"]}