{"id":2229875,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229875/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-68-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-68-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:06:08","name":"[67/97] NAN: Update peer schedule when the peer advertises new availability map","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b892673d33eec8e9b166c2c37b915a756c97da9f","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-68-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/2229875/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229875/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=aikvB4S3;\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=B8jcyMuX;\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=C8u6N4nB;\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 4g4s8L2jwCz1xrS\n\tfor ; Wed, 29 Apr 2026 06:13:54 +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 1wHoo5-00000002K88-27es;\n\tTue, 28 Apr 2026 20:13:21 +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 1wHoke-00000002FNC-3Ft2\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:09:48 +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 1wHokV-00000004NBq-3oJ6\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:47 +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:58 -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:57 -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=9zCCYRc7xEeEKhSim9c8sS6co+afnUZjpCpVL5VZ+Xo=; b=aikvB4S3qmMB2Q\n\tWmyqGh/ExIXkeQKWWGE5AcW6tz0lOUJwd1TgSsWoTTF329OrpHew8YsVU+Mc+F2zHyWsAzEpQIseX\n\tMUIqJmw/OGiQfb8h1XVj5kzTUpJv0N3FLm77z9vFFkNiuw+ZwirB2oUGqIfyKx1nrkRe+CDh2v4fc\n\tS+UD+vibMjnDSHhwqqXthD038U6ppdXjpW4RQFHLHtS7HzLI2AGFixZyI3SjCr7MPuIMTnOH77H4j\n\tb2fnu/uo6n+akCP81J9+Nf7QlinOf4p+V1ApRMMa8+B5WT5/WIKQWhbkdvNNpZYOD3cgN2lR4SgIF\n\tBhGBgdB4y5Lfhr6nsFDA==;","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=hsQlKza6vYPEoWN7Tz9Jou95yhtt4NjsC50iFtgfAX8=; b=B8jcyMuXdou0T+/9lq6+YhZceR\n\tt+y2h8NfC8fj3TGI4HSHt+RxZuJD3uM75a6r+FnJOMHsCMoLyU8V1BJIwQPcDW8nsJxLpH/Lh5jgG\n\tPWU0wA7YgOMQn86aqbMCe4OE2/f3QcZeP/1+aJjsBlouhlt5z8u8HlVyKJOYL+7tXKb7YQXbmdLi7\n\t/85nN/2kleNa4EbduPS/sLuFl1awPS1Hu1ssbJhx4HGaQJ60KD69Qal95k/KunFdnoc+Rq1s8E98e\n\tfov7n4lRv7d8ZGkBevn7JhRb2DK8ZhIXqxSlSMPyXOJYJ8q9a0ikTGpHuX2U/mXqNU42qTFTyxdFG\n\tNYlRBDJQ==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406980; x=1808942980;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=MPtL0rXvdNhG0lbBpu5lxx5wmTm+16LJVSUcqpCRrZI=;\n b=C8u6N4nBklIiRmVDAufnhlilx32fOaBa8rgDXQttQZUXNv9eLoiddfzQ\n vLcoZ9cFSP9yGU5yBZ1/zyrqoarChT80aATe4hH7Tfh5xnzoXO0F2VR/Z\n JNdF/q5Sa4RBQopQBt0sFC0yVYIB8gy1xykHPL2+UpRTsnF8Q9bVtuwoG\n 0mStr/yqF7D9fEBi+1kPN9ZR7EVsYVZkbAoPjZZ8qHl1Gs1BTcB8XI1sf\n BtfXkmBPpnPbp5gXTZBDkva0t6twygYGuWafgQ4TZDLXHvRGtfiDIBfjx\n SfszDqN2Xsh9S07pJ/v2S7a0BmS8SObxqTq2JMxTKRnjuSFxsJ+kjKjuZ\n A==;"],"X-CSE-ConnectionGUID":["gtUdlDUVQH67NrIbEuxrOQ==","NJGVsYJwTuG12a1XHG09ag=="],"X-CSE-MsgGUID":["xEJNwWmTQRSakwXOIrSp5A==","dxoQiTZKSgG+9GoE4QCB0w=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519505\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519505\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610698\""],"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 67/97] NAN: Update peer schedule when the peer advertises new\n availability map","Date":"Tue, 28 Apr 2026 23:06:08 +0300","Message-ID":"<20260428200639.40243-68-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_210940_308191_2D31508D ","X-CRM114-Status":"GOOD ( 16.28 )","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\nWhen a peer with whom the device has an active NDL advertises a new\navailability map, update the peer's schedule according to the new\nmap. If the new map doesn't intersect with the local availability or\nbreaks NDC or QoS requirements, terminate any existing NDPs with\nthis peer.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.c | 77 +++++++++++++++++++++++++++++++++++++++++++++--\n src/nan/nan.h | 8 +++++\n src/nan/nan_i.h | 1 +\n src/nan/nan_ndl.c | 3 +-\n 4 files changed, 85 insertions(+), 4 deletions(-)","diff":"diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex ed948b1a44..a1a72a5a31 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -26,6 +26,8 @@ static void nan_idle_period_timeout(void *eloop_ctx, void *timeout_ctx);\n static void nan_ndp_disconnected(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t enum nan_reason reason,\n \t\t\t\t bool locally_generated);\n+static int nan_action_send(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t enum nan_subtype subtype);\n \n \n struct nan_data * nan_init(const struct nan_config *cfg)\n@@ -945,12 +947,80 @@ static void nan_peer_dump(struct nan_data *nan, struct nan_peer *peer)\n }\n \n \n+static void nan_peer_disconnect_all_ndps(struct nan_data *nan,\n+\t\t\t\t\t struct nan_peer *peer)\n+{\n+\tstruct nan_ndp *ndp, *tmp;\n+\tu8 *local_ndi = NULL, *peer_ndi = NULL;\n+\tstruct nan_ndp_id ndp_id;\n+\n+\tif (peer->ndp_setup.ndp)\n+\t\tnan_ndp_disconnected(nan, peer,\n+\t\t\t\t NAN_REASON_UNSPECIFIED_REASON,\n+\t\t\t\t false);\n+\n+\tdl_list_for_each_safe(ndp, tmp, &peer->ndps, struct nan_ndp,\n+\t\t\t list) {\n+\t\tif (ndp->initiator) {\n+\t\t\tlocal_ndi = ndp->init_ndi;\n+\t\t\tpeer_ndi = ndp->resp_ndi;\n+\t\t} else {\n+\t\t\tlocal_ndi = ndp->resp_ndi;\n+\t\t\tpeer_ndi = ndp->init_ndi;\n+\t\t}\n+\n+\t\tos_memcpy(&ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);\n+\t\tos_memcpy(ndp_id.init_ndi, ndp->init_ndi, ETH_ALEN);\n+\t\tndp_id.id = ndp->ndp_id;\n+\n+\t\tpeer->ndp_setup.ndp = ndp;\n+\t\tpeer->ndp_setup.state = NAN_NDP_STATE_DONE;\n+\t\tpeer->ndp_setup.status = NAN_NDP_STATUS_REJECTED;\n+\t\tpeer->ndp_setup.reason = NAN_REASON_UNSPECIFIED_REASON;\n+\t\tnan_action_send(nan, peer,\n+\t\t\t\tNAN_SUBTYPE_DATA_PATH_TERMINATION);\n+\t\tpeer->ndp_setup.ndp = NULL;\n+\n+\t\tdl_list_del(&ndp->list);\n+\t\tnan_ndp_terminated(nan, peer, &ndp_id, local_ndi,\n+\t\t\t\t peer_ndi,\n+\t\t\t\t NAN_REASON_UNSPECIFIED_REASON,\n+\t\t\t\t ndp->gtk_id);\n+\t\tos_free(ndp);\n+\t}\n+}\n+\n+\n+static void nan_peer_update_schedule(struct nan_data *nan,\n+\t\t\t\t struct nan_peer *peer,\n+\t\t\t\t struct nan_schedule *sched)\n+{\n+\tstruct bitfield *common_bf;\n+\tint ret = -1;\n+\n+\tcommon_bf = nan_peer_schedule_intersection(nan, peer, sched);\n+\tif (common_bf && nan_ndl_meets_qos(nan, peer, common_bf) &&\n+\t nan_ndl_validate_peer_avail(nan, peer))\n+\t\tret = nan_configure_peer_schedule(nan, peer, sched);\n+\telse\n+\t\twpa_printf(MSG_DEBUG, \"NAN: New peer schedule breaks NDL\");\n+\n+\tif (ret)\n+\t\tnan_peer_disconnect_all_ndps(nan, peer);\n+\telse if (nan->cfg->schedule_changed)\n+\t\tnan->cfg->schedule_changed(nan->cfg->cb_ctx, peer->nmi_addr);\n+\n+\tbitfield_free(common_bf);\n+}\n+\n+\n /*\n * Update the old peer info with information from the new peer info.\n * Information that is available in the old peer info but is not available\n * in the new peer info will not be changed.\n */\n-static void nan_merge_peer_info(struct nan_peer_info *old,\n+static void nan_merge_peer_info(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t\tstruct nan_peer_info *old,\n \t\t\t\tstruct nan_peer_info *new)\n {\n \tif (!dl_list_empty(&new->avail_entries)) {\n@@ -965,6 +1035,9 @@ static void nan_merge_peer_info(struct nan_peer_info *old,\n \t\t\tdl_list_add(&old->avail_entries, &avail->list);\n \t\t}\n \t\told->seq_id = new->seq_id;\n+\n+\t\tif (peer->ndl && peer->ndl->state == NAN_NDL_STATE_DONE)\n+\t\t\tnan_peer_update_schedule(nan, peer, &nan->sched);\n \t}\n \n \told->last_seen = new->last_seen;\n@@ -1209,7 +1282,7 @@ int nan_parse_device_attrs(struct nan_data *nan, struct nan_peer *peer,\n \t\tgoto out;\n \t}\n \n-\tnan_merge_peer_info(&peer->info, &info);\n+\tnan_merge_peer_info(nan, peer, &peer->info, &info);\n \tnan_parse_peer_device_capa(nan, peer, &attrs);\n \tnan_parse_peer_elem_container(nan, peer, &attrs);\n \tnan_parse_peer_dev_capa_ext(nan, peer, &attrs);\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 0aa380e4d4..7e1eb20143 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -781,6 +781,14 @@ struct nan_config {\n \t */\n \tint (*get_peer_inactivity)(void *ctx, const u8 *local_ndi,\n \t\t\t\t const u8 *peer_ndi);\n+\n+\t/**\n+\t * schedule_changed - Notify about peer schedule change\n+\t *\n+\t * @ctx: Callback context from cb_ctx\n+\t * @peer_nmi: Peer NMI address\n+\t */\n+\tvoid (*schedule_changed)(void *ctx, const u8 *peer_nmi);\n };\n \n struct nan_data * nan_init(const struct nan_config *cfg);\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 6a75467659..f4fad1bd39 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -736,6 +736,7 @@ struct bitfield *nan_peer_schedule_intersection(\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+bool nan_ndl_validate_peer_avail(struct nan_data *nan, struct nan_peer *peer);\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 e54bb0303f..0eb7c798fb 100644\n--- a/src/nan/nan_ndl.c\n+++ b/src/nan/nan_ndl.c\n@@ -195,8 +195,7 @@ static struct nan_ndl * nan_ndl_alloc(struct nan_data *nan)\n }\n \n \n-static bool nan_ndl_validate_peer_avail(struct nan_data *nan,\n-\t\t\t\t\tstruct nan_peer *peer)\n+bool nan_ndl_validate_peer_avail(struct nan_data *nan, struct nan_peer *peer)\n {\n \tstruct nan_ndl *ndl = peer->ndl;\n \tbool ret;\n","prefixes":["67/97"]}