Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2198433/?format=api
{ "id": 2198433, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2198433/?format=api", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.0/projects/22/?format=api", "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": "<20260219202514.5781-36-andrei.otcheretianski@intel.com>", "date": "2026-02-19T20:24:51", "name": "[35/58] NAN: Support handling NDP termination from peer in NDP SM", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c3efdb71624ceba062c0c79d2b73b5d971b250b1", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.0/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260219202514.5781-36-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 492721, "url": "http://patchwork.ozlabs.org/api/1.0/series/492721/?format=api", "date": "2026-02-19T20:24:21", "name": "NAN: Add NAN Data Path (NDP) support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492721/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2198433/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=GKnRkdUd;\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=dlz3CHYD;\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 4fH4hq0WVHz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 20 Feb 2026 07:28:43 +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 1vtAd8-0000000Bz2z-41QC;\n\tThu, 19 Feb 2026 20:28:11 +0000", "from mgamail.intel.com ([198.175.65.10])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAcZ-0000000BwCB-3JlD\n\tfor hostap@lists.infradead.org;\n\tThu, 19 Feb 2026 20:27:52 +0000", "from orviesa004.jf.intel.com ([10.64.159.144])\n by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:27:10 -0800", "from aotchere-mobl1.ger.corp.intel.com (HELO\n aotchere-mobl1.intel.com) ([10.245.246.171])\n by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:27:07 -0800" ], "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=9xVkO8ZRx06fA6KEy28u1ZjJ04IScXY8JvrcEmoz1v0=; b=GKnRkdUdP7Mm+Z\n\toQaeGVde9elY6ckD60Q7SbB6NyVxm03rlwxS92WFLijoqMgET0jIgNP8Y8PWewezIE1hM4cwfvfuR\n\t1UkNvR/gnceQOdkeaauh3XgxqbhzZXY7D/52+vLs7ERpkLwNRQK9smo2/BB+8tYrh7ARTIDDfRU5F\n\tiIcFQUcDUokPnEi4xLk7uXZC4/RREQhoGCXhzYKjQuD/jIJEXQVpWye5qah7UCuFufJX+pZT2nC1k\n\t5UHvOfbbam/gqe1n3jpKxetuFVMlAxKLruo4wbwDxjqHEy8z5GFHleMOjg2eXlu7AqK7dufFjQVak\n\tqGuZpZlRLhpwhAMhsJbQ==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1771532856; x=1803068856;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=FUycbkeLYoLP3cr6zX2bSruYZaOm/YfohauPUYPltSk=;\n b=dlz3CHYD3j9oUC5Od5MXQLcJ4kCXEz6L9YFYeP4djzPGkx3WQEPO0EJw\n gocQVkg80a9ZoHmSI3i4Ve3h7fbb6RhLDOip6pRU1IDAY2TUVaDsBYK9k\n qQsFtHawzxSbwFBzsH9BqBoBMdKEQMvreDoqUyEreNZb9z5q+qeDqEkB8\n aDhyzEwaf6bG3jGcFw0KJeUreqKighjsVCUh20Ml9XS5uqwMnQ1ai4b7f\n zvMNaIQF9u6IRxdS00b5xCx7X5rRgt/CPTntmn5B1BniJiLLN//CK/gGt\n T6MnyN12SOIPOXv9ptcZcLMEg8/8DORVX3P6GthCYpbSL7JzUcwuJJUIO\n w==;" ], "X-CSE-ConnectionGUID": [ "2WUgHpfWTGeD9GMEUuoFQw==", "v78C7Kz8R/2CGEY9pGn22w==" ], "X-CSE-MsgGUID": [ "wtw8Ynp5QKaY758rE1sbsA==", "wxglRNy4Ti6LNbV1Qc4qig==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11706\"; a=\"90040092\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"90040092\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"219153944\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org,\n\tvamsin@qti.qualcomm.com,\n\tvganneva@qti.qualcomm.com,\n\tmaheshkkv@google.com", "Cc": "Ilan Peer <ilan.peer@intel.com>", "Subject": "[PATCH 35/58] NAN: Support handling NDP termination from peer in NDP\n SM", "Date": "Thu, 19 Feb 2026 22:24:51 +0200", "Message-ID": "<20260219202514.5781-36-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260219202514.5781-1-andrei.otcheretianski@intel.com>", "References": "<20260219202514.5781-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-20260219_122736_076071_AAB84FF1 ", "X-CRM114-Status": "GOOD ( 23.36 )", "X-Spam-Score": "-4.4 (----)", "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: Ilan Peer <ilan.peer@intel.com> Add support for\n terminating\n an NDP whose setup is complete. In case there are no more NDPs with the\n peer,\n the NDL is also torn down. Signed-off-by: Ilan Peer <ilan.peer@intel.com>\n --- src/nan/nan.c | 18 +++++++++- src/nan/nan_i.h | 3 ++ src/nan/nan_ndp.c\n | 90 ++++++++++++++++++++++++++++++++++++ 3 files changed, 89 inser [...] \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.10 listed in list.dnswl.org]\n 0.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.10 listed in sa-accredit.habeas.com]\n 0.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.10 listed in\n sa-trusted.bondedsender.org]\n 0.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.10 listed in\n bl.score.senderscore.com]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\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_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\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": "<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": "From: Ilan Peer <ilan.peer@intel.com>\n\nAdd support for terminating an NDP whose setup\nis complete. In case there are no more NDPs with the\npeer, the NDL is also torn down.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/nan/nan.c | 18 +++++++++-\n src/nan/nan_i.h | 3 ++\n src/nan/nan_ndp.c | 90 ++++++++++++++++++++++++++++++++++++-----------\n 3 files changed, 89 insertions(+), 22 deletions(-)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 57e477699a..cc1d3e88b2 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1256,8 +1256,11 @@ static int nan_action_rx_ndp(struct nan_data *nan, struct nan_peer *peer,\n \tint ret;\n \n \tret = nan_ndp_handle_ndp_attr(nan, peer, msg);\n-\tif (ret)\n+\tif (ret) {\n+\t\tif (ret > 0)\n+\t\t\tret = 0;\n \t\treturn ret;\n+\t}\n \n \t/*\n \t * NDP request: Also process the NDL/NDC/QoS attributes and store the\n@@ -1621,3 +1624,16 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\n \tnan_set_peer_timeout(nan, peer, timeout, 0);\n \treturn ret;\n }\n+\n+\n+void nan_ndp_terminated(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\tstruct nan_ndp_id *ndp_id, const u8 *local_ndi,\n+\t\t\tconst u8 *peer_ndi, enum nan_reason reason)\n+{\n+\tnan->cfg->ndp_disconnected(nan->cfg->cb_ctx, ndp_id, local_ndi, peer_ndi,\n+\t\t\t\t reason);\n+\n+\t/* Need to also remove the NDL if it is not needed */\n+\tif (dl_list_empty(&peer->ndps) && !peer->ndp_setup.ndp)\n+\t\tnan_ndl_reset(nan, peer);\n+}\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 0c15d29d17..d26401178f 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -492,4 +492,7 @@ nan_sched_bf_covered_by_avail_entries_and_chan(struct nan_data *nan,\n struct bitfield * nan_avail_entries_to_bf(struct nan_data *nan,\n \t\t\t\t\t const struct dl_list *avail_entries,\n \t\t\t\t\t u8 op_class, u16 cbm, u16 pri_cbm);\n+void nan_ndp_terminated(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\tstruct nan_ndp_id *ndp_id, const u8 *local_ndi,\n+\t\t\tconst u8 *peer_ndi, enum nan_reason reason);\n #endif /* NAN_I_H */\ndiff --git a/src/nan/nan_ndp.c b/src/nan/nan_ndp.c\nindex 3a2ea7c129..560ed4387d 100644\n--- a/src/nan/nan_ndp.c\n+++ b/src/nan/nan_ndp.c\n@@ -473,33 +473,79 @@ static int nan_ndp_attr_handle_term(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t struct ieee80211_ndp *ndp_attr, u8 status)\n {\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n+\tstruct nan_ndp_id ndp_id;\n+\tconst u8 *local_ndi, *peer_ndi;\n+\tstruct nan_ndp *pndp;\n+\tbool found;\n+\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP: Termination peer=\" MACSTR \" ndp_id=%u, init_ndi=\" MACSTR,\n+\t\t MAC2STR(peer->nmi_addr), ndp_attr->ndp_id,\n+\t\t MAC2STR(ndp_attr->initiator_ndi));\n \n \t/*\n-\t * This should not really happen, but just in case,\n-\t * terminate the establishment.\n+\t * This should not really happen, but just in case, terminate the\n+\t * establishment. Since the NDP establishment is not yet done, the NDP\n+\t * is not added to the list of NDPs, so just reject the establishment.\n \t */\n-\tif (ndp_setup->ndp) {\n-\t\tif (ndp_setup->ndp->ndp_id == ndp_attr->ndp_id &&\n-\t\t os_memcmp(ndp_setup->ndp->init_ndi,\n-\t\t\t ndp_attr->initiator_ndi,\n-\t\t\t ETH_ALEN) == 0) {\n-\t\t\twpa_printf(MSG_DEBUG,\n-\t\t\t\t \"NAN: NDP: term: WIP with peer. Terminate\");\n+\tif (ndp_setup->ndp && ndp_setup->ndp->ndp_id == ndp_attr->ndp_id &&\n+\t os_memcmp(ndp_setup->ndp->init_ndi, ndp_attr->initiator_ndi,\n+\t\t ETH_ALEN) == 0) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: Termination while NDP is in progress\");\n \n-\t\t\tnan_ndp_set_state(nan, &peer->ndp_setup,\n-\t\t\t\t\t NAN_NDP_STATE_DONE);\n-\t\t\tndp_setup->status = NAN_NDP_STATUS_REJECTED;\n-\t\t\tndp_setup->reason = NAN_REASON_UNSPECIFIED_REASON;\n-\t\t} else {\n-\t\t\twpa_printf(MSG_DEBUG,\n-\t\t\t\t \"NAN: NDP: term: different NDP WIP with peer. Ignore\");\n-\t\t}\n+\t\tnan_ndp_set_state(nan, &peer->ndp_setup, NAN_NDP_STATE_DONE);\n+\t\tndp_setup->status = NAN_NDP_STATUS_REJECTED;\n+\t\tndp_setup->reason = NAN_REASON_UNSPECIFIED_REASON;\n \t\treturn 0;\n \t}\n \n-\t/* TODO: handle already established NDPs */\n-\twpa_printf(MSG_DEBUG, \"NAN: NDP: Terminate established NDP\");\n-\treturn 0;\n+\t/* Find the NDP in the list of active NDPs */\n+\tfound = false;\n+\tdl_list_for_each(pndp, &peer->ndps, struct nan_ndp, list) {\n+\t\tif (pndp->ndp_id == ndp_attr->ndp_id &&\n+\t\t os_memcmp(pndp->init_ndi, ndp_attr->initiator_ndi,\n+\t\t\t ETH_ALEN) == 0) {\n+\t\t\tfound = 1;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (!found) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN: NDP: termination but NDP does not exist\");\n+\t\treturn 1;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: NDP: Terminating\");\n+\n+\tos_memcpy(ndp_id.peer_nmi, peer->nmi_addr, ETH_ALEN);\n+\tos_memcpy(ndp_id.init_ndi, pndp->init_ndi, ETH_ALEN);\n+\tndp_id.id = pndp->ndp_id;\n+\n+\tif (pndp->initiator) {\n+\t\tlocal_ndi = pndp->init_ndi;\n+\t\tpeer_ndi = pndp->resp_ndi;\n+\t} else {\n+\t\tlocal_ndi = pndp->resp_ndi;\n+\t\tpeer_ndi = pndp->init_ndi;\n+\t}\n+\n+\t/*\n+\t * Remove the NDP from the list of active NDPs before calling\n+\t * nan_ndp_terminated() as the functions checks the list of NDPs to\n+\t * determine if the NDL should be reset as well.\n+\t * Free the NDP only after the call as the NDI addresses are still\n+\t * referenced.\n+\t */\n+\tdl_list_del(&pndp->list);\n+\n+\tnan_ndp_terminated(nan, peer, &ndp_id, local_ndi, peer_ndi,\n+\t\t\t ndp_attr->reason_code);\n+\n+\tos_free(pndp);\n+\n+\t/* Indicate that no further processing is needed */\n+\treturn 1;\n }\n \n \n@@ -509,7 +555,9 @@ static int nan_ndp_attr_handle_term(struct nan_data *nan, struct nan_peer *peer,\n * @nan: NAN module context from nan_init()\n * @peer: The peer from which the original message was received\n * @msg: Parsed nan action frame\n- * Returns: 0 on success, negative on failure\n+ * Returns: 0 on success processing indicating that processing can continue; 1\n+ * in case of successful processing but no further processing is needed;\n+ * negative on failure.\n */\n int nan_ndp_handle_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t struct nan_msg *msg)\n", "prefixes": [ "35/58" ] }