{"id":2229871,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229871/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-65-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.1/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":"<20260428200639.40243-65-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:06:05","name":"[64/97] NAN: Modify nan_peer_schedule_intersects() to return the common slots","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"006c1c9425fc89e80b5097e9fecdd30815da4510","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.1/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-65-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501927,"url":"http://patchwork.ozlabs.org/api/1.1/series/501927/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/list/?series=501927","date":"2026-04-28T20:05:05","name":"NAN: Group keys support, schedule update and more","version":1,"mbox":"http://patchwork.ozlabs.org/series/501927/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229871/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229871/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=ZUn6bJDj;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=casper.20170209 header.b=O2kSBP+h;\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=WKd16b6n;\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 4g4s7t1ZL0z1xrS\n\tfor ; Wed, 29 Apr 2026 06:13:30 +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 1wHoni-00000002JbF-1uX0;\n\tTue, 28 Apr 2026 20:12:58 +0000","from casper.infradead.org ([2001:8b0:10b:1236::1])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHokS-00000002F7b-3OHG\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:09:37 +0000","from mgamail.intel.com ([198.175.65.16])\n\tby casper.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHokN-00000004NBq-3Lf4\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:34 +0000","from fmviesa001.fm.intel.com ([10.60.135.141])\n by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:53 -0700","from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 28 Apr 2026 13:08:52 -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=hG2bJNvrUqar/Fb2YMVQHIvEtEuTGXG18BolduAPjVo=; b=ZUn6bJDjqKXwkc\n\tbG63rzXoAYtK9ngD69SguJJlFsIPcSgljXecfwQg7GieSNIFi0YZgFAKIhTGUY1Q6Oxqd3pHKoQ0u\n\tQ5tIc7I1LNyE2kELjSWNc+uFSsu9tOf6oToRlftf3VOaDXPegqc0ReOCGrL7rYCODRaQboUrk278x\n\tpTgcryyl/18iizP3wh2FQC3h8hor7Kfn5iaTDjM3f6FllEgQ0CGB4eIqTU3jPlfXGJInMaTGH+A02\n\tDb5CqrGLMJVFCDR1QGsZ1iUxFHAqZ74zJPCj8+WywF9V64yMWusRaDde5eNLrtYBK1XstNiHhVHfx\n\tozgYoBYFZfq2RVZWElSA==;","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version:\n\tReferences:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=pAo3vs7bX/ffG2Lhd6Ryxlrxs/lFix78yZuN9WP+6q8=; b=O2kSBP+hStaS1NK2as6+Fmyq20\n\tP0A8vY0UVHKjyvpRn+ayy6SQjLREwn3q/AuhFzaLRxawUglg3/K6RP73xqOKIVd401fW9fyn+sWqH\n\tT9s9COEDDIVI363toxRP1SlIc26TtjzxQYdNQNqqMk0cfSyFmvPuDo6YmYo+WubLT9fIMp6yamXYp\n\tdconP/LhwxN3i4MH0+sUAAMjHoNC2BDGR95tHwqn/FUgAgTyNmtr8p2wjZ3I/G6YUFHl1zD/0fgyw\n\t/deDs+jH30pjsSUbuo9OgzzrI3qqQxgShx1P+f8a/saHwes1HW1cEpDzOjqq3xSTD+SBY6vrBS0Vo\n\tbF5TKYsw==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406971; x=1808942971;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=r5Njv9x8z69Kgl4w+qJIPnuot0yDkVlaL1NqmpZL16o=;\n b=WKd16b6nvQ2BMcCe32T5fNlq+jSUoRWnXDLbhl06txD08Yoq5nYQhIHQ\n HVR60on+8lnRnUWj6iYHlgrOHaWQW99vXFJJy/5IF2FS2sFXZOtcCcpFt\n fzd4egxa0eN8X0UwwGevc728cVqf8013p5/HJ85kdC08Apha2g69UFX5s\n lfMPWx6FhHhP7tl+5XRB/x5Ys1q8AJEqsotGptjoUCZyoR7I9SGUhY0J0\n U/Rxxazvr/2hW/e6m1ZF5XgxXe9u3w42HG5UqiCO/26wuAXZA1FJimlnb\n 5Rk1LphSWGG1PN3qlSp2eTXArHRAH296sjPdjUi4R6pERoEuzYd6genLs\n g==;"],"X-CSE-ConnectionGUID":["V37JwMPOTEaqZJleW2RsLw==","FopJvMpPSP+8/HLhH3JcJQ=="],"X-CSE-MsgGUID":["9fGCqGNHR/KZQPc81aUBiw==","qsEbzS0NSZ+GL/+8wSjHng=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519493\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519493\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610669\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Cc":"vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tAvraham Stern ","Subject":"[PATCH 64/97] NAN: Modify nan_peer_schedule_intersects() to return\n the common slots","Date":"Tue, 28 Apr 2026 23:06:05 +0300","Message-ID":"<20260428200639.40243-65-andrei.otcheretianski@intel.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260428200639.40243-1-andrei.otcheretianski@intel.com>","References":"<20260428200639.40243-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-20260428_210932_229543_32BF5188 ","X-CRM114-Status":"GOOD ( 15.62 )","X-Spam-Score":"-4.4 (----)","X-Spam-Report":"SpamAssassin version 4.0.1 on casper.infradead.org summary:\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.16 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_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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\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: Avraham Stern \n\nModify nan_peer_schedule_intersects() to return a bitfield of the\ncommon slots with a given peer, or NULL if there are no common slots.\nRename it to nan_peer_schedule_intersection() to better reflect its\nnew purpose.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.c | 7 +++++-\n src/nan/nan_i.h | 6 ++---\n src/nan/nan_util.c | 62 ++++++++++++++++++++++++++++++++++++++--------\n 3 files changed, 60 insertions(+), 15 deletions(-)","diff":"diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex b23b64a6e6..1e8325a140 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -9,6 +9,7 @@\n #include \"includes.h\"\n #include \"common.h\"\n #include \"utils/eloop.h\"\n+#include \"utils/bitfield.h\"\n #include \"common/ieee802_11_common.h\"\n #include \"pasn/pasn_common.h\"\n #include \"nan.h\"\n@@ -1438,16 +1439,20 @@ int nan_configure_peer_schedule(struct nan_data *nan, struct nan_peer *peer,\n \tstruct nan_dev_capa_entry *cur;\n \tstruct nan_device_capabilities *capa = NULL;\n \tstruct nan_peer_schedule sched;\n+\tstruct bitfield *common_bf;\n \n \twpa_printf(MSG_DEBUG, \"NAN: Configure peer schedule\");\n \n \tos_memset(&sched, 0, sizeof(sched));\n-\tif (nan_peer_schedule_intersects(nan, peer, local_sched))\n+\tcommon_bf = nan_peer_schedule_intersection(nan, peer, local_sched);\n+\tif (common_bf)\n \t\tnan_peer_get_committed_avail(nan, peer, local_sched, &sched);\n \telse\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: Cannot configure peer schedule since there is no intersection\");\n \n+\tbitfield_free(common_bf);\n+\n \tdl_list_for_each(cur, &peer->info.dev_capa,\n \t\t\t struct nan_dev_capa_entry, list) {\n \t\t/*\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 592268aa4a..ff36fa04af 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -731,9 +731,9 @@ int nan_ndl_add_avail_attrs(struct nan_data *nan, const struct nan_peer *peer,\n void nan_ndl_add_elem_container_attr(const struct nan_data *nan,\n \t\t\t\t const struct nan_peer *peer,\n \t\t\t\t struct wpabuf *buf);\n-bool nan_peer_schedule_intersects(struct nan_data *nan,\n-\t\t\t\t const struct nan_peer *peer,\n-\t\t\t\t const struct nan_schedule *sched);\n+struct bitfield *nan_peer_schedule_intersection(\n+\tstruct nan_data *nan, const struct nan_peer *peer,\n+\tconst struct nan_schedule *sched);\n int nan_convert_chan_sched_to_bf(struct nan_data *nan,\n \t\t\t\t const struct nan_chan_schedule *chan,\n \t\t\t\t struct bitfield **avail_bf, u8 *map_id,\ndiff --git a/src/nan/nan_util.c b/src/nan/nan_util.c\nindex d55baebe81..da9337092a 100644\n--- a/src/nan/nan_util.c\n+++ b/src/nan/nan_util.c\n@@ -1914,21 +1914,26 @@ int nan_convert_chan_sched_to_bf(struct nan_data *nan,\n \n \n /*\n- * nan_peer_schedule_intersects - Check if local and peer schedules intersect\n+ * nan_peer_schedule_intersection - Get local and peer schedules intersection\n *\n * @nan: NAN module context from nan_init()\n * @peer: The peer with whom to intersect the schedule\n * @sched: Local device schedule\n- * Returns: true if schedules intersect, false otherwise\n+ * Returns: Bitfield representing the intersection of schedules, or NULL if\n+ *\tno intersection\n *\n * The function checks if the local device schedule intersects with the peer\n- * device schedule.\n+ * device schedule and returns a bitfield representing the intersection,\n+ * or NULL if no intersection.\n */\n-bool nan_peer_schedule_intersects(struct nan_data *nan,\n-\t\t\t\t const struct nan_peer *peer,\n-\t\t\t\t const struct nan_schedule *sched)\n+struct bitfield *nan_peer_schedule_intersection(\n+\tstruct nan_data *nan,\n+\tconst struct nan_peer *peer,\n+\tconst struct nan_schedule *sched)\n {\n \tsize_t i;\n+\tstruct bitfield *common_bf = NULL;\n+\tbool intersects = false;\n \n \t/*\n \t * Iterate over all the channels included in the local schedule. For\n@@ -1955,7 +1960,7 @@ bool nan_peer_schedule_intersects(struct nan_data *nan,\n \t\tif (ret) {\n \t\t\twpa_printf(MSG_DEBUG,\n \t\t\t\t \"NAN: NDL: Failed to convert chan sched to bitfield\");\n-\t\t\treturn false;\n+\t\t\treturn NULL;\n \t\t}\n \n \t\t/* Get the peer availability for the current channel */\n@@ -1968,16 +1973,51 @@ bool nan_peer_schedule_intersects(struct nan_data *nan,\n \t\t\tcontinue;\n \t\t}\n \n-\t\tret = bitfield_intersects(own_chan_bf, peer_chan_bf);\n+\t\tintersects |= bitfield_intersects(own_chan_bf, peer_chan_bf);\n+\n+\t\tret = bitfield_intersect_in_place(own_chan_bf, peer_chan_bf);\n+\t\tif (ret < 0) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: Failed to intersect own and peer chan bitfields\");\n+\t\t\tbitfield_free(own_chan_bf);\n+\t\t\tbitfield_free(peer_chan_bf);\n+\t\t\tbitfield_free(common_bf);\n+\t\t\treturn NULL;\n+\t\t}\n \n \t\tbitfield_free(peer_chan_bf);\n+\n+\t\tif (common_bf) {\n+\t\t\tret = bitfield_union_in_place(common_bf, own_chan_bf);\n+\t\t\tif (ret) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Failed to unify own chan bitfields\");\n+\n+\t\t\t\tbitfield_free(own_chan_bf);\n+\t\t\t\tbitfield_free(common_bf);\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tcommon_bf = bitfield_dup(own_chan_bf);\n+\t\t\tif (!common_bf) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Failed to dup own chan bitfield\");\n+\n+\t\t\t\tbitfield_free(own_chan_bf);\n+\t\t\t\tbitfield_free(common_bf);\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\t\t}\n+\n \t\tbitfield_free(own_chan_bf);\n+\t}\n \n-\t\tif (ret == 1)\n-\t\t\treturn true;\n+\tif (!intersects) {\n+\t\tbitfield_free(common_bf);\n+\t\treturn NULL;\n \t}\n \n-\treturn false;\n+\treturn common_bf;\n }\n \n \n","prefixes":["64/97"]}