{"id":2229873,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229873/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-67-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-67-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:06:07","name":"[66/97] NAN: Move NDL QoS checks into a function","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4230ae7e54abe5f70a33cb26b55bd88858303853","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-67-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/2229873/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229873/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=nvu3pkkT;\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=miU8/9SG;\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=mwmmEPgn;\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 4g4s8C5Sfwz1xrS\n\tfor ; Wed, 29 Apr 2026 06:13:47 +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 1wHonw-00000002Jtw-0NgY;\n\tTue, 28 Apr 2026 20:13:12 +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 1wHokX-00000002FCi-0Usa\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:09:41 +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 1wHokR-00000004NBq-2LWJ\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:39 +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:56 -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:55 -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=vpTReHYX0u1SXsmNlLhUH9VJ5kYTt7cWBbCeOVtGR1E=; b=nvu3pkkT14lbId\n\tZSoW+Xa1v/G9Ir5/tBAcp8xIacrw4bZe4UqZlcbdAIWd/f3nGCVckjPeVkyc3fiZP7ShjxQJbGRU2\n\tH9yIDFRnSh6AbZ/qsltXXh/jAIK6TcStxwQxO4wuiog5fbx7NKjShON5vRndqMC69a5o4YN6/SwFL\n\tzMI0POhd2tRahIOxFSzSIhNndJwSsYwuRbOP80crJsz3asLosot3dqAirRDTXGs/Zg1NjeYOqrTcI\n\tzx7Ll5S4Sv10ufBJRVkNIi/SDdYRHaHSgCnoua6/hnr8b4T00Fa8ngcYJoZB456HKJZrcy7z0m78E\n\t/cnjFskO/+sy5N5PmiFQ==;","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=NQaQ15y9W/eFROK2z0kFRJ60mQi6OGBGYl0nuw1/b/k=; b=miU8/9SGSV+RHHFFoC9/vUXmhi\n\tfJkdi/DzTuKatgQYHICcbHTWk0OSCAYg/SgNh/h8bY1LiOUvk18HR2wL9Q44VvmZt04etJNGQvYo/\n\tI2ZZyIt34otON1xzyv/fSsO8bNupevUqjxBWFoyCNe46vnIAwyin55m35Pk6r/kn5V3c/MFI/lfj0\n\tc404y2f/K8l4ZzpdHesmCRGyFm132y0uKRFYEQa8G1IL8NqxGBf9ml6vy1QM+2FXrhTx8JAyCJZMp\n\thZTo/KVmWn3vZyzX92tx8Hy3ypUxL4FVT6awivP1nEoZoU8FpwC7Ra82g/JdGD3lsnd7mfTJ4sZOw\n\tZrV2egIg==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406975; x=1808942975;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=8XCBM8LSRTd2oXsET4qxUhJkHH3A73lRZNg7+Xix/fs=;\n b=mwmmEPgniWLXvRiIg7hlK3LEbmBJYhHG45YKofyqb7cJsL8deA1Lsqvi\n NFHcWDHNoRDW/i8u4as32u1gN1mwPzJFDCEwcjFVzOR3q0DrVKZUkwjN3\n Zj3wMkLyQLqO48U2M+BR3cu4yINrXNWYzuS3OKaRYsL7Okw9oeThxjcbz\n A6ND7IcGIL6OC0/Kg/M0FdIts4Tymm52OVpw49E0KEQqBn2FzvtyccA4q\n YWRAPwTBjUI6IW2/Ns+9u/+oX0lv3EISJGZ2/8Vr34KdMUQJjktJFylFS\n 8nDWpfFl/gr8n9mGn5K963pqYdRkccGYWAxzZ3N0/1jy7tZx7rCGBnTO4\n g==;"],"X-CSE-ConnectionGUID":["i7ij2AyZTeCdW6Y4PMEYDg==","+UtKA/RmQtyeft8skAZIOg=="],"X-CSE-MsgGUID":["Qjk9TvxkQyWvX+p3V4QA7Q==","SuhG2r+yQECJJalNuOnXMQ=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519500\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519500\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610686\""],"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 66/97] NAN: Move NDL QoS checks into a function","Date":"Tue, 28 Apr 2026 23:06:07 +0300","Message-ID":"<20260428200639.40243-67-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_210935_937133_8B584DC4 ","X-CRM114-Status":"GOOD ( 15.95 )","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\nMove the checks if the NDL meets QoS requirements into a function.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan_i.h | 2 +\n src/nan/nan_ndl.c | 96 +++++++++++++++++++++++++----------------------\n 2 files changed, 53 insertions(+), 45 deletions(-)","diff":"diff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex cf1c5819c1..6a75467659 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -734,6 +734,8 @@ void nan_ndl_add_elem_container_attr(const struct nan_data *nan,\n struct bitfield *nan_peer_schedule_intersection(\n \tstruct nan_data *nan, const struct nan_peer *peer,\n \tconst struct nan_schedule *sched);\n+bool nan_ndl_meets_qos(struct nan_data *nan, struct nan_peer *peer,\n+\t\t struct bitfield *common_bf);\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_ndl.c b/src/nan/nan_ndl.c\nindex d6cf1fa431..e54bb0303f 100644\n--- a/src/nan/nan_ndl.c\n+++ b/src/nan/nan_ndl.c\n@@ -337,6 +337,52 @@ nan_ndl_match_sched_vs_common(struct nan_data *nan,\n }\n \n \n+bool nan_ndl_meets_qos(struct nan_data *nan, struct nan_peer *peer,\n+\t\t struct bitfield *common_bf)\n+{\n+\tsize_t size, max_latency, i;\n+\tu16 crbs;\n+\n+\t/* No QoS requirements */\n+\tif (peer->ndl->peer_qos.min_slots == NAN_QOS_MIN_SLOTS_NO_PREF &&\n+\t peer->ndl->peer_qos.max_latency == NAN_QOS_MAX_LATENCY_NO_PREF) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: No QoS requirements from Peer\");\n+\t\treturn true;\n+\t}\n+\n+\tsize = bitfield_size(common_bf);\n+\n+\t/*\n+\t * The common map covers an entire 8192 period with 16 TU slots. For\n+\t * minimal time slots need to only consider the first 32 slots\n+\t */\n+\tfor (i = 0, crbs = 0, max_latency = 0; i < size; i++) {\n+\t\tif (bitfield_is_set(common_bf, i)) {\n+\t\t\tif (i < 32)\n+\t\t\t\tcrbs++;\n+\n+\t\t\tmax_latency = 0;\n+\t\t} else if (peer->ndl->peer_qos.max_latency !=\n+\t\t\t NAN_QOS_MAX_LATENCY_NO_PREF) {\n+\t\t\tmax_latency++;\n+\t\t\tif (max_latency > peer->ndl->peer_qos.max_latency) {\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: Failed to meet max latency\");\n+\t\t\t\treturn false;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (peer->ndl->peer_qos.min_slots != NAN_QOS_MIN_SLOTS_NO_PREF &&\n+\t peer->ndl->peer_qos.min_slots >= crbs) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: Failed to meet min slots\");\n+\t\treturn false;\n+\t}\n+\n+\treturn true;\n+}\n+\n+\n static enum nan_ndl_status nan_ndl_determine_status(struct nan_data *nan,\n \t\t\t\t\t\t struct nan_peer *peer,\n \t\t\t\t\t\t bool can_counter,\n@@ -345,8 +391,7 @@ static enum nan_ndl_status nan_ndl_determine_status(struct nan_data *nan,\n \tstruct nan_schedule *sched = &nan->sched;\n \tstruct bitfield *common_bf = NULL, *ndc_bf = NULL, *track_ndc_bf = NULL;\n \tenum nan_ndl_ver verdict;\n-\tsize_t size, max_latency, i;\n-\tu16 crbs;\n+\tsize_t i;\n \tint ret;\n \n \t*reason = NAN_REASON_RESERVED;\n@@ -538,54 +583,15 @@ static enum nan_ndl_status nan_ndl_determine_status(struct nan_data *nan,\n \t\tgoto out;\n \t}\n \n-\t/* No QoS requirements. Accept */\n-\tif (peer->ndl->peer_qos.min_slots == NAN_QOS_MIN_SLOTS_NO_PREF &&\n-\t peer->ndl->peer_qos.max_latency == NAN_QOS_MAX_LATENCY_NO_PREF) {\n-\t\twpa_printf(MSG_DEBUG,\n-\t\t\t \"NAN: No QoS requirements from Peer. Accept\");\n-\n+\tif (nan_ndl_meets_qos(nan, peer, common_bf)) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NDL QoS requirements met. Accept\");\n \t\tret = NAN_NDL_STATUS_ACCEPTED;\n-\t\tgoto out;\n-\t}\n-\n-\tsize = bitfield_size(common_bf);\n-\twpa_printf(MSG_DEBUG, \"NAN: size of avail intersection map=%zu\", size);\n-\n-\t/*\n-\t * The common map covers an entire 8192 TU period with 16 TU slots. For\n-\t * minimal time slots need to only consider the first 32 slots.\n-\t */\n-\tfor (i = 0, crbs = 0, max_latency = 0; i < size; i++) {\n-\t\tif (bitfield_is_set(common_bf, i)) {\n-\t\t\tif (i < 32)\n-\t\t\t\tcrbs++;\n-\n-\t\t\tmax_latency = 0;\n-\t\t} else if (peer->ndl->peer_qos.max_latency !=\n-\t\t\t NAN_QOS_MAX_LATENCY_NO_PREF) {\n-\t\t\tmax_latency++;\n-\t\t\tif (max_latency > peer->ndl->peer_qos.max_latency) {\n-\t\t\t\twpa_printf(MSG_DEBUG,\n-\t\t\t\t\t \"NAN: Failed to meet max latency\");\n-\n-\t\t\t\t*reason = NAN_REASON_QOS_UNACCEPTABLE;\n-\t\t\t\tret = NAN_NDL_STATUS_CONTINUED;\n-\t\t\t\tgoto out;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\tif (peer->ndl->peer_qos.min_slots != NAN_QOS_MIN_SLOTS_NO_PREF &&\n-\t peer->ndl->peer_qos.min_slots >= crbs) {\n-\t\twpa_printf(MSG_DEBUG,\n-\t\t\t \"NAN: Failed to meet min slots\");\n-\n+\t} else {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NDL QoS requirements not met\");\n \t\t*reason = NAN_REASON_QOS_UNACCEPTABLE;\n \t\tret = NAN_NDL_STATUS_CONTINUED;\n-\t\tgoto out;\n \t}\n \n-\tret = NAN_NDL_STATUS_ACCEPTED;\n out:\n \tbitfield_free(common_bf);\n \tbitfield_free(ndc_bf);\n","prefixes":["66/97"]}