{"id":2229874,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229874/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-66-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-66-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:06:06","name":"[65/97] NAN: Move local schedule from NDL data to global NAN data","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fafa7809c60e90e8a3cf5be22db3126ccc101589","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-66-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/2229874/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229874/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=jqWSagE5;\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=EdJVRgFe;\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 4g4s8H1zSPz1xrS\n\tfor ; Wed, 29 Apr 2026 06:13:51 +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 1wHoo0-00000002K1U-3X1S;\n\tTue, 28 Apr 2026 20:13:16 +0000","from mgamail.intel.com ([198.175.65.16])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHokN-00000002CcZ-1lod\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:42 +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:55 -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:54 -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=VFEJaTApmmJtkcRT7TLi31B0m8km59E1ykL8TEpAEv4=; b=jqWSagE58tQHcG\n\tO3SGQ8EbE88RCHw4KUfpM9m82enXp2+1CJQBcsc2d3Otf+2Kt7/2/3DxcGZj0fSbm3HMjEPQbFOP8\n\tss1J/NLl4Ex2sPP+z+SNySmrvWyIt70bVw90BjZ7nSuGuPlsmRCETuHawnvhCLPkAEANGsoyhCiU1\n\tlfBsaTm3H2r9ndHc36hN7dK0vd06qxOFAGX7XNEZnqUMNQC6vamaWe6Gr9DXKtUD4I1wPWpq1tRjh\n\tzUBQCDJYur2gcUB7wDTzaJaiJl5zmZqQB/LBxyWT8hvxst4l02QZNS7gDMD4fM0g7VI5IsAMU4cLz\n\tHLws8oiZRF9P6i0sFI0Q==;","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=CwgK6noWiyv0OB6i0Bz++c3WM2dQeEqIpGwwDms8ApI=;\n b=EdJVRgFeNhiHGm7zq/fycCBQwocG1Y3ttyNYVnPZyM3stSkw8sxcDJPP\n 081nxPj9AJKCcvnKMJWx/e2WcNsh7GQ+N2VSSnyXiLYYMK7dHXPjkWUc6\n ReE0DfGfWDGse6MTSAu6cGwPTsev1rY6U5pg90GJDv+3v0nyM5m7XFaHD\n BBSxZcvvloIdqbuXVmnMUHvdbG7W7pPjb9R1H0bHiGeZZUq/HFrK6lLS3\n RfDRVCtWvPPPbf42aOe+F1c+j7r8RakueH6YDQAxgFFIHjsdTlHld4ONt\n Ho8HJgO/onhGQ/bu+pRbvQaiArFOD2GhtvCsStbWCt2IiqiyohFIpKAxg\n Q==;"],"X-CSE-ConnectionGUID":["JPjCFvEPRri2dH1tnqly4A==","2r5arOzDQtyuEOQcopd6lw=="],"X-CSE-MsgGUID":["WyGy69xLSlexN/qgXxfmYw==","lBi8ycAHSzmMAL7gtd0+dw=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519496\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519496\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610678\""],"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 65/97] NAN: Move local schedule from NDL data to global NAN\n data","Date":"Tue, 28 Apr 2026 23:06:06 +0300","Message-ID":"<20260428200639.40243-66-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_130931_632463_98D465F8 ","X-CRM114-Status":"GOOD ( 19.04 )","X-Spam-Score":"-4.5 (----)","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: Avraham Stern The local\n schedule\n is copied to each peer's NDL data. This is redundant as the local schedule\n is common. Move the local schedule to the nan_data struct. Signed-off-by:\n Avraham Stern --- src/nan/nan.c | 16\n ++++++++++------\n src/nan/nan_i.h | 4 ++-- src/nan/nan_ndl.c | 49 ++++++++++++++++++++++++\n 3 files c [...]\n Content analysis details: (-4.5 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_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 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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.1 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\nThe local schedule is copied to each peer's NDL data. This is\nredundant as the local schedule is common. Move the local schedule\nto the nan_data struct.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.c | 16 ++++++++++------\n src/nan/nan_i.h | 4 ++--\n src/nan/nan_ndl.c | 49 ++++++++++++++++++++++++-----------------------\n 3 files changed, 37 insertions(+), 32 deletions(-)","diff":"diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 1e8325a140..ed948b1a44 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -232,6 +232,7 @@ void nan_deinit(struct nan_data *nan)\n \tpasn_initiator_pmksa_cache_deinit(nan->initiator_pmksa);\n \tpasn_responder_pmksa_cache_deinit(nan->responder_pmksa);\n #endif /* CONFIG_PASN */\n+\twpabuf_free(nan->sched.elems);\n \tos_free(nan->cfg);\n \tos_free(nan);\n }\n@@ -372,6 +373,8 @@ void nan_flush(struct nan_data *nan)\n \n \tnan->nan_started = 0;\n \tnan_peer_clear_all(nan);\n+\twpabuf_free(nan->sched.elems);\n+\tos_memset(&nan->sched, 0, sizeof(nan->sched));\n }\n \n \n@@ -1992,7 +1995,7 @@ static int nan_action_rx_ndp(struct nan_data *nan, struct nan_peer *peer,\n \tif (peer->ndp_setup.state == NAN_NDP_STATE_DONE &&\n \t peer->ndl->state == NAN_NDL_STATE_DONE) {\n \t\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDP setup done\");\n-\t\tif (nan_configure_peer_schedule(nan, peer, &peer->ndl->sched) ||\n+\t\tif (nan_configure_peer_schedule(nan, peer, &nan->sched) ||\n \t\t nan_ndp_connected(nan, peer))\n \t\t\tnan_ndp_disconnected(nan, peer,\n \t\t\t\t\t NAN_REASON_UNSPECIFIED_REASON,\n@@ -2296,7 +2299,8 @@ int nan_tx_status(struct nan_data *nan, const u8 *dst, const u8 *data,\n \tif (peer->ndp_setup.state == NAN_NDP_STATE_DONE &&\n \t peer->ndl->state == NAN_NDL_STATE_DONE) {\n \t\twpa_printf(MSG_DEBUG, \"NAN: TX status: NDP setup done\");\n-\t\tif (nan_configure_peer_schedule(nan, peer, &peer->ndl->sched) ||\n+\n+\t\tif (nan_configure_peer_schedule(nan, peer, &nan->sched) ||\n \t\t nan_ndp_connected(nan, peer))\n \t\t\tnan_ndp_disconnected(nan, peer,\n \t\t\t\t\t NAN_REASON_UNSPECIFIED_REASON,\n@@ -2356,7 +2360,7 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\n \n \t\tnaf_oui = NAN_SUBTYPE_DATA_PATH_REQUEST;\n \t\ttimeout = NAN_NDP_SETUP_TIMEOUT_LONG;\n-\t\tret = nan_configure_peer_schedule(nan, peer, &peer->ndl->sched);\n+\t\tret = nan_configure_peer_schedule(nan, peer, &nan->sched);\n \t\tif (ret) {\n \t\t\tnan_ndp_setup_stop(nan, peer);\n \t\t\treturn ret;\n@@ -2378,8 +2382,8 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\n \t\t\tret = nan_ndl_setup(nan, peer, params,\n \t\t\t\t\t peer->ndp_setup.dialog_token);\n \t\t\tif (!ret) {\n-\t\t\t\tret = nan_configure_peer_schedule(\n-\t\t\t\t\tnan, peer, &peer->ndl->sched);\n+\t\t\t\tret = nan_configure_peer_schedule(nan, peer,\n+\t\t\t\t\t\t\t\t &nan->sched);\n \t\t\t\tif (ret)\n \t\t\t\t\tpeer->ndl->send_naf_on_error = 1;\n \t\t\t}\n@@ -2413,7 +2417,7 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\n \t\t\t\t peer->ndp_setup.dialog_token);\n \t\tif (!ret) {\n \t\t\tret = nan_configure_peer_schedule(nan, peer,\n-\t\t\t\t\t\t\t &peer->ndl->sched);\n+\t\t\t\t\t\t\t &nan->sched);\n \t\t\tif (ret)\n \t\t\t\tpeer->ndl->send_naf_on_error = 1;\n \t\t}\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex ff36fa04af..cf1c5819c1 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -390,7 +390,6 @@ enum nan_ndl_setup_reason {\n * returned an error, a NAF still needs to be sent to the peer, i.e., the\n * error cannot be silently ignored.\n * @reason: In case of status == NAN_NDL_STATUS_REJECTED, indicates the reason.\n- * @sched: Holds the local schedule.\n * @dialog_token: The dialog token for the current NDL negotiation.\n * @max_idle_period: Indicate a period of time in units of 1024 TU during which\n * the peer device can refrain from transmitting over the NDL without\n@@ -409,7 +408,6 @@ struct nan_ndl {\n \tenum nan_ndl_status status;\n \tu8 send_naf_on_error;\n \tenum nan_reason reason;\n-\tstruct nan_schedule sched;\n \n \tu8 dialog_token;\n \tu16 max_idle_period;\n@@ -575,6 +573,7 @@ struct nan_peer {\n * and is used to set ndp_id in &struct nan_ndp.\n * @next_dialog_token: Dialog token for NDP and NDL negotiations. Incremented\n * for each NDP and NDL request.\n+ * @sched: Holds the local schedule. See &struct nan_schedule\n * @cluster_id: Current cluster ID\n * @nira_nonce: Nonce for NAN Identity Resolution attribute (NIRA)\n * @nira_tag: Tag for NAN Identity Resolution attribute (NIRA)\n@@ -592,6 +591,7 @@ struct nan_data {\n \n \tu8 ndp_id_counter;\n \tu8 next_dialog_token;\n+\tstruct nan_schedule sched;\n \n \tu8 cluster_id[ETH_ALEN];\n \ndiff --git a/src/nan/nan_ndl.c b/src/nan/nan_ndl.c\nindex ca69b6ec06..d6cf1fa431 100644\n--- a/src/nan/nan_ndl.c\n+++ b/src/nan/nan_ndl.c\n@@ -142,9 +142,6 @@ static void nan_ndl_clear(struct nan_data *nan, struct nan_peer *peer)\n \tndl->local_qos.max_latency = NAN_QOS_MAX_LATENCY_NO_PREF;\n \n \tndl->setup_reason = NAN_NDL_SETUP_REASON_NONE;\n-\n-\twpabuf_free(ndl->sched.elems);\n-\tos_memset(&ndl->sched, 0, sizeof(ndl->sched));\n }\n \n \n@@ -345,7 +342,7 @@ static enum nan_ndl_status nan_ndl_determine_status(struct nan_data *nan,\n \t\t\t\t\t\t bool can_counter,\n \t\t\t\t\t\t enum nan_reason *reason)\n {\n-\tstruct nan_schedule *sched = &peer->ndl->sched;\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@@ -682,21 +679,23 @@ int nan_ndl_setup(struct nan_data *nan, struct nan_peer *peer,\n \t\tgoto out_fail;\n \t}\n \n-\twpabuf_free(ndl->sched.elems);\n-\tos_memcpy(&ndl->sched, ¶ms->sched, sizeof(ndl->sched));\n-\tnan_ndl_sched_print(nan, &peer->ndl->sched);\n+\twpabuf_free(nan->sched.elems);\n+\tos_memcpy(&nan->sched, ¶ms->sched, sizeof(nan->sched));\n+\tnan_ndl_sched_print(nan, &nan->sched);\n \n \t/* Copy elems buffer */\n \tif (params->sched.elems) {\n-\t\tndl->sched.elems =\n+\t\tnan->sched.elems =\n \t\t\twpabuf_alloc_copy(wpabuf_head(params->sched.elems),\n \t\t\t\t\t wpabuf_len(params->sched.elems));\n-\t\tif (!ndl->sched.elems) {\n+\t\tif (!nan->sched.elems) {\n \t\t\treason = NAN_REASON_UNSPECIFIED_REASON;\n \t\t\tgoto out_fail;\n \t\t}\n \t}\n \n+\tnan_ndl_sched_print(nan, &nan->sched);\n+\n \tif (is_zero_ether_addr(ndl->ndc_id)) {\n \t\tos_get_random(ndl->ndc_id, ETH_ALEN);\n \t\twpa_printf(MSG_DEBUG,\n@@ -1352,7 +1351,7 @@ int nan_ndl_add_avail_attrs(struct nan_data *nan, const struct nan_peer *peer,\n \tif (!peer || !peer->ndl)\n \t\treturn -1;\n \n-\tsched = &peer->ndl->sched;\n+\tsched = &nan->sched;\n \n \twpa_printf(MSG_DEBUG,\n \t\t \"NAN: NDL: Add Avail attribute. state=%s, status=%u\",\n@@ -1397,6 +1396,7 @@ int nan_ndl_add_ndl_attr(struct nan_data *nan, const struct nan_peer *peer,\n \t\t\t struct wpabuf *buf)\n {\n \tstruct nan_ndl *ndl;\n+\tstruct nan_schedule *sched = &nan->sched;\n \tu16 ndl_ctrl = 0;\n \tu8 *len_ptr;\n \tu8 type;\n@@ -1426,18 +1426,18 @@ int nan_ndl_add_ndl_attr(struct nan_data *nan, const struct nan_peer *peer,\n \t\treturn -1;\n \tcase NAN_NDL_STATE_START:\n \t\ttype = NAN_NDL_TYPE_REQUEST;\n-\t\tif (ndl->sched.ndc.len)\n+\t\tif (sched->ndc.len)\n \t\t\tndl_ctrl |= NAN_NDL_CTRL_NDC_ATTR_PRESENT;\n \t\tbreak;\n \tcase NAN_NDL_STATE_REQ_RECV:\n \t\ttype = NAN_NDL_TYPE_RESPONSE;\n-\t\tif (ndl->sched.ndc.len &&\n+\t\tif (sched->ndc.len &&\n \t\t ndl->status != NAN_NDL_STATUS_REJECTED)\n \t\t\tndl_ctrl |= NAN_NDL_CTRL_NDC_ATTR_PRESENT;\n \t\tbreak;\n \tcase NAN_NDL_STATE_RES_RECV:\n \t\ttype = NAN_NDL_TYPE_CONFIRM;\n-\t\tif (ndl->sched.ndc.len &&\n+\t\tif (sched->ndc.len &&\n \t\t ndl->status != NAN_NDL_STATUS_REJECTED)\n \t\t\tndl_ctrl |= NAN_NDL_CTRL_NDC_ATTR_PRESENT;\n \t\tbreak;\n@@ -1480,6 +1480,7 @@ int nan_ndl_add_ndc_attr(struct nan_data *nan, const struct nan_peer *peer,\n \t\t\t struct wpabuf *buf)\n {\n \tstruct nan_ndl *ndl;\n+\tstruct nan_schedule *sched = &nan->sched;\n \tu8 ndc_ctrl = NAN_NDC_CTRL_SELECTED;\n \tu16 sched_entry_ctrl = 0;\n \n@@ -1504,7 +1505,7 @@ int nan_ndl_add_ndc_attr(struct nan_data *nan, const struct nan_peer *peer,\n \t * NDC attribute for NDP Request is optional. In all other cases it is\n \t * mandatory\n \t */\n-\tif (!ndl->sched.ndc.len) {\n+\tif (!sched->ndc.len) {\n \t\tif (ndl->state != NAN_NDL_STATE_START) {\n \t\t\twpa_printf(MSG_DEBUG, \"NAN: NDL: No NDC to add\");\n \t\t\treturn -1;\n@@ -1516,26 +1517,26 @@ int nan_ndl_add_ndc_attr(struct nan_data *nan, const struct nan_peer *peer,\n \twpabuf_put_u8(buf, NAN_ATTR_NDC);\n \twpabuf_put_le16(buf, sizeof(struct ieee80211_ndc) +\n \t\t\tsizeof(struct nan_sched_entry) +\n-\t\t\tndl->sched.ndc.len);\n+\t\t\tsched->ndc.len);\n \n \twpabuf_put_data(buf, ndl->ndc_id, sizeof(ndl->ndc_id));\n \twpabuf_put_u8(buf, ndc_ctrl);\n \n \t/* Add the schedule entry */\n-\twpabuf_put_u8(buf, ndl->sched.ndc_map_id);\n+\twpabuf_put_u8(buf, sched->ndc_map_id);\n \n-\tsched_entry_ctrl |= ndl->sched.ndc.duration <<\n+\tsched_entry_ctrl |= sched->ndc.duration <<\n \t\tNAN_TIME_BM_CTRL_BIT_DURATION_POS;\n-\tsched_entry_ctrl |= ndl->sched.ndc.period <<\n+\tsched_entry_ctrl |= sched->ndc.period <<\n \t\tNAN_TIME_BM_CTRL_PERIOD_POS;\n-\tsched_entry_ctrl |= ndl->sched.ndc.offset <<\n+\tsched_entry_ctrl |= sched->ndc.offset <<\n \t\tNAN_TIME_BM_CTRL_START_OFFSET_POS;\n \n \twpabuf_put_le16(buf, sched_entry_ctrl);\n \n \t/* Add the time bitmap */\n-\twpabuf_put_u8(buf, ndl->sched.ndc.len);\n-\twpabuf_put_data(buf, ndl->sched.ndc.bitmap, ndl->sched.ndc.len);\n+\twpabuf_put_u8(buf, sched->ndc.len);\n+\twpabuf_put_data(buf, sched->ndc.bitmap, sched->ndc.len);\n \n \treturn 0;\n }\n@@ -1692,7 +1693,7 @@ void nan_ndl_add_elem_container_attr(const struct nan_data *nan,\n {\n \tconst struct nan_ndl *ndl;\n \n-\tif (!peer || !peer->ndl || !peer->ndl->sched.elems)\n+\tif (!peer || !peer->ndl || !nan->sched.elems)\n \t\treturn;\n \n \tndl = peer->ndl;\n@@ -1709,7 +1710,7 @@ void nan_ndl_add_elem_container_attr(const struct nan_data *nan,\n \t\treturn;\n \n \twpabuf_put_u8(buf, NAN_ATTR_ELEM_CONTAINER);\n-\twpabuf_put_le16(buf, 1 + wpabuf_len(ndl->sched.elems));\n+\twpabuf_put_le16(buf, 1 + wpabuf_len(nan->sched.elems));\n \twpabuf_put_u8(buf, 0);\n-\twpabuf_put_buf(buf, ndl->sched.elems);\n+\twpabuf_put_buf(buf, nan->sched.elems);\n }\n","prefixes":["65/97"]}