Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2229888/?format=api
{ "id": 2229888, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2229888/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-81-andrei.otcheretianski@intel.com/", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.1/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": "<20260428200639.40243-81-andrei.otcheretianski@intel.com>", "date": "2026-04-28T20:06:21", "name": "[80/97] wpa_supplicant: Support tracking NAN transmit requests", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "3fb0d6f77ef3e665ebd41aa96cba070918755060", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.1/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-81-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 501927, "url": "http://patchwork.ozlabs.org/api/1.1/series/501927/?format=api", "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/2229888/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2229888/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=p0AfBXOs;\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=JXt2uB9v;\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=A66qzOJH;\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 4g4s9n1k7Cz1xrS\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 29 Apr 2026 06:15:09 +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 1wHopG-00000002Lnf-0Vzr;\n\tTue, 28 Apr 2026 20:14:34 +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 1wHokv-00000002Fl7-3IYL\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:10:06 +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-3ocM\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:10:04 +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:09:18 -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:09:17 -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=OPkbBz2ihpTCE2y753SY7thwda0vroTBHw+vulrorio=; b=p0AfBXOssVD3B1\n\tCmMwMJkaNpd43SJokGrotjoAqlDDmp57Yj8KgGlK3YPx1tPnXHf5sAAudZQqesVisRfcy3/yXZm0r\n\t6O4Kn+WXYExKZe3EDl/43RhbnTQitXJKpRLlYdd0ed+TAI73BuI1vR2oQxwhry7jdv1CYnUjHAzTP\n\tYcKyyJFFMF9OdNfCYNw9uNmeir4NyShqtcMUmBj17NjqpHLsdnbACWE6fBm+OJ7inSugbEMWT+jCB\n\t6CGToIDclKvkGAN+lOO/DPhM221rTHYF2n/w4OaBeBxYjJgHou0MOIx0FK3EjsPkhptpGGlXVt+GN\n\tgwMicoiE+S0/e4qGeSvg==;", "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=AZx9zqvGGrth6iXCLt1hr3AKSTYDl+P3cy/JQyhq+xQ=; b=JXt2uB9v3/bqctY/pfGwEp2WKp\n\tj3GeLZ/4IqsPQ1oTRe2CJIodtygXwAAo1vjDZDT1+kYeTsQUPQ6DwFkQDJcV1OdLx83f5xQTXBGGv\n\tXeQWPGEQOMSOsJgexR94E8wI35nocKN+XWeVFMqvCrfzX8GEqDr+kZKcX5gVaILI2wJUtHftP0H4K\n\tJKkKPozinUe9nTbXaJt1mdfJLFDshIblLo96uOv/TgnwJM5UhAkz9y0axeH12vhVsOtl5mOwZpVLI\n\tnwlCWccRFMFh1KxMm3BO81f0pt5y/+qDkHXFaMXOSyWROZA/d5AtOFP7QY85OqdacVlkdOGNa/28O\n\tQ3Yy14CQ==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777407002; x=1808943002;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=tRh1O80gMHumI5TQEVbN6Cfw2kjIP/82CSe8PJbdaOE=;\n b=A66qzOJHmY4Z0WTCg75TJ6CjHe1gN7XWgqAhrT3icu2ie4PmDMjU+Kur\n SG06lRlIsevcqqszastJsS0nhSmXOCpPkDkAyQpN+DzIvymCdDiFWau2c\n 8EhvAPqvFIXrXtxadGMk7CeKhwDpekfnQplHgofGui0LOxWT6lHP0DiBu\n q8HvdDqfIN4aq614PSmCNNafGBWmehO3zqTWfo6WYvTjl4UXxhsP2rc5M\n B65W8vMK60QoTFgAPZP1vlkEJgUVEFaFhlWV5SXU/FY2Cdg+mXo534tSB\n HtphlWSlEzui5oiv1kAd0WuRlBIGf089TsvGlhZtpTBXuCRh+1pfPPTNq\n Q==;" ], "X-CSE-ConnectionGUID": [ "T8BcEIK1Sy6SfJ7Njz6AKg==", "zR9y6P32ROSJRtawBNuhWQ==" ], "X-CSE-MsgGUID": [ "j3mKb6xxQneBkpN7Jezcsg==", "ehcmqG9ASMG1SSaZiknw1w==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11770\"; a=\"78519556\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519556\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610813\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Cc": "vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tIlan Peer <ilan.peer@intel.com>", "Subject": "[PATCH 80/97] wpa_supplicant: Support tracking NAN transmit requests", "Date": "Tue, 28 Apr 2026 23:06:21 +0300", "Message-ID": "<20260428200639.40243-81-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_211002_270789_2716413A ", "X-CRM114-Status": "GOOD ( 14.42 )", "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": "<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\nExtended the NAN transmit API to also include a cookie,\nso that when the NAN DE finishes transmitting the frame\nit would notify the higher layers whether the frame was\nacknowledged or not.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/common/wpa_ctrl.h | 1 +\n wpa_supplicant/ctrl_iface.c | 17 ++++++++++++++++-\n wpa_supplicant/dbus/dbus_new_handlers.c | 2 +-\n wpa_supplicant/nan_supplicant.c | 19 +++++++++++++++++--\n wpa_supplicant/nan_supplicant.h | 3 ++-\n wpa_supplicant/notify.c | 8 ++++++++\n wpa_supplicant/notify.h | 2 ++\n 7 files changed, 47 insertions(+), 5 deletions(-)", "diff": "diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h\nindex e5aa42649a..411d22ace9 100644\n--- a/src/common/wpa_ctrl.h\n+++ b/src/common/wpa_ctrl.h\n@@ -246,6 +246,7 @@ extern \"C\" {\n #define NAN_PUBLISH_TERMINATED \"NAN-PUBLISH-TERMINATED \"\n #define NAN_SUBSCRIBE_TERMINATED \"NAN-SUBSCRIBE-TERMINATED \"\n #define NAN_RECEIVE \"NAN-RECEIVE \"\n+#define NAN_TRANSMIT_STATUS \"NAN-TRANSMIT-STATUS \"\n #define NAN_CLUSTER_JOIN \"NAN-CLUSTER-JOIN \"\n #define NAN_NDP_REQUEST \"NAN-NDP-REQUEST \"\n #define NAN_NDP_COUNTER_REQUEST \"NAN-NDP-COUNTER-REQUEST \"\ndiff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c\nindex 8a96b4f812..7a9444c62c 100644\n--- a/wpa_supplicant/ctrl_iface.c\n+++ b/wpa_supplicant/ctrl_iface.c\n@@ -13261,6 +13261,8 @@ static int wpas_ctrl_nan_transmit(struct wpa_supplicant *wpa_s, char *cmd)\n \tstruct wpabuf *ssi = NULL;\n \tu8 peer_addr[ETH_ALEN];\n \tint ret = -1;\n+\tu32 cookie = 0;\n+\tu32 *cookie_ptr = NULL;\n \n \tos_memset(peer_addr, 0, ETH_ALEN);\n \n@@ -13286,6 +13288,19 @@ static int wpas_ctrl_nan_transmit(struct wpa_supplicant *wpa_s, char *cmd)\n \t\t\tcontinue;\n \t\t}\n \n+\t\tif (os_strncmp(token, \"cookie=\", 7) == 0) {\n+\t\t\tcookie = strtoul(token + 7, NULL, 0);\n+\t\t\tif (!cookie) {\n+\t\t\t\twpa_printf(MSG_INFO,\n+\t\t\t\t\t \"CTRL: Invalid cookie value: %s\",\n+\t\t\t\t\t token + 7);\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\n+\t\t\tcookie_ptr = &cookie;\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\twpa_printf(MSG_INFO,\n \t\t\t \"CTRL: Invalid NAN_TRANSMIT parameter: %s\",\n \t\t\t token);\n@@ -13305,7 +13320,7 @@ static int wpas_ctrl_nan_transmit(struct wpa_supplicant *wpa_s, char *cmd)\n \t}\n \n \tret = wpas_nan_transmit(wpa_s, handle, ssi, NULL, peer_addr,\n-\t\t\t\treq_instance_id);\n+\t\t\t\treq_instance_id, cookie_ptr);\n fail:\n \twpabuf_free(ssi);\n \treturn ret;\ndiff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c\nindex cb4a8a6d38..a9f5679443 100644\n--- a/wpa_supplicant/dbus/dbus_new_handlers.c\n+++ b/wpa_supplicant/dbus/dbus_new_handlers.c\n@@ -7035,7 +7035,7 @@ DBusMessage * wpas_dbus_handler_nan_transmit(DBusMessage *message,\n \t\tgoto fail;\n \n \tif (wpas_nan_transmit(wpa_s, handle, ssi, NULL, peer_addr,\n-\t\t\t req_instance_id) < 0)\n+\t\t\t req_instance_id, NULL) < 0)\n \t\treply = wpas_dbus_error_unknown_error(\n \t\t\tmessage, \"failed to transmit follow-up\");\n out:\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex a4cc5597fd..82dd82f3a5 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -4000,6 +4000,14 @@ static void wpas_nan_de_receive(void *ctx, int id, int peer_instance_id,\n }\n \n \n+static void wpas_nan_de_transmit_req_status(void *ctx, u32 cookie, bool ack)\n+{\n+\tstruct wpa_supplicant *wpa_s = ctx;\n+\n+\twpas_notify_nan_transmit_req_status(wpa_s, cookie, ack);\n+}\n+\n+\n #ifdef CONFIG_P2P\n static void wpas_nan_process_p2p_usd_elems(void *ctx, const u8 *buf,\n \t\t\t\t\t u16 buf_len, const u8 *peer_addr,\n@@ -4051,6 +4059,7 @@ int wpas_nan_de_init(struct wpa_supplicant *wpa_s)\n \tcb.offload_cancel_publish = wpas_nan_usd_offload_cancel_publish;\n \tcb.offload_cancel_subscribe = wpas_nan_usd_offload_cancel_subscribe;\n \tcb.receive = wpas_nan_de_receive;\n+\tcb.transmit_req_status = wpas_nan_de_transmit_req_status;\n #ifdef CONFIG_P2P\n \tcb.process_p2p_usd_elems = wpas_nan_process_p2p_usd_elems;\n #endif /* CONFIG_P2P */\n@@ -4387,12 +4396,13 @@ int wpas_nan_usd_subscribe_stop_listen(struct wpa_supplicant *wpa_s,\n \n int wpas_nan_transmit(struct wpa_supplicant *wpa_s, int handle,\n \t\t const struct wpabuf *ssi, const struct wpabuf *elems,\n-\t\t const u8 *peer_addr, u8 req_instance_id)\n+\t\t const u8 *peer_addr, u8 req_instance_id,\n+\t\t u32 *cookie)\n {\n \tif (!wpa_s->nan_de)\n \t\treturn -1;\n \treturn nan_de_transmit(wpa_s->nan_de, handle, ssi, elems, peer_addr,\n-\t\t\t req_instance_id, NULL, NULL);\n+\t\t\t req_instance_id, NULL, cookie);\n }\n \n \n@@ -4527,6 +4537,11 @@ int wpas_nan_tx_status(struct wpa_supplicant *wpa_s,\n \t\t(const struct ieee80211_mgmt *) data;\n \n \twpa_s = wpas_nan_get_mgmt_iface(wpa_s);\n+\n+\tif (wpa_s->nan_de)\n+\t\tnan_de_tx_status(wpa_s->nan_de, 0, mgmt->da, data, data_len,\n+\t\t\t\t acked);\n+\n \tif (!wpas_nan_ndp_allowed(wpa_s))\n \t\treturn -1;\n \ndiff --git a/wpa_supplicant/nan_supplicant.h b/wpa_supplicant/nan_supplicant.h\nindex 415934fc35..0ebbc545a6 100644\n--- a/wpa_supplicant/nan_supplicant.h\n+++ b/wpa_supplicant/nan_supplicant.h\n@@ -140,7 +140,8 @@ void wpas_nan_cancel_subscribe(struct wpa_supplicant *wpa_s,\n \t\t\t int subscribe_id);\n int wpas_nan_transmit(struct wpa_supplicant *wpa_s, int handle,\n \t\t const struct wpabuf *ssi, const struct wpabuf *elems,\n-\t\t const u8 *peer_addr, u8 req_instance_id);\n+\t\t const u8 *peer_addr, u8 req_instance_id,\n+\t\t u32 *cookie);\n int wpas_nan_tx_status(struct wpa_supplicant *wpa_s,\n \t\t const u8 *data, size_t data_len, int acked);\n \ndiff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c\nindex d8aba5a331..d73bb2aced 100644\n--- a/wpa_supplicant/notify.c\n+++ b/wpa_supplicant/notify.c\n@@ -1268,6 +1268,14 @@ void wpas_notify_nan_subscribe_terminated(struct wpa_supplicant *wpa_s,\n }\n \n \n+void wpas_notify_nan_transmit_req_status(struct wpa_supplicant *wpa_s,\n+\t\t\t\t\t u32 cookie, bool acked)\n+{\n+\twpa_msg_global(wpa_s, MSG_INFO, NAN_TRANSMIT_STATUS\n+\t\t \"cookie=%u acked=%u\", cookie, acked);\n+}\n+\n+\n void wpas_notify_nan_bootstrap_request(struct wpa_supplicant *wpa_s,\n \t\t\t\t const u8 *peer_nmi, u16 pbm,\n \t\t\t\t int handle, u8 requestor_instance_id)\ndiff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h\nindex 260173e928..9c7609ee3d 100644\n--- a/wpa_supplicant/notify.h\n+++ b/wpa_supplicant/notify.h\n@@ -201,6 +201,8 @@ void wpas_notify_nan_publish_terminated(struct wpa_supplicant *wpa_s,\n void wpas_notify_nan_subscribe_terminated(struct wpa_supplicant *wpa_s,\n \t\t\t\t\t int subscribe_id,\n \t\t\t\t\t enum nan_de_reason reason);\n+void wpas_notify_nan_transmit_req_status(struct wpa_supplicant *wpa_s,\n+\t\t\t\t\t u32 cookie, bool acked);\n void wpas_notify_nan_nik_received(struct wpa_supplicant *wpa_s,\n \t\t\t\t const u8 *nik, size_t nik_len,\n \t\t\t\t int cipher_ver, int akmp,\n", "prefixes": [ "80/97" ] }