Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226426/?format=api
{ "id": 2226426, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226426/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-80-andrei.otcheretianski@intel.com/", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.2/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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260422122424.43776-80-andrei.otcheretianski@intel.com>", "list_archive_url": null, "date": "2026-04-22T12:24:10", "name": "[79/92] wpa_supplicant: Support NAN pairing abort", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0ab4ba95c61ed19086cb44ea08d7893f380b8190", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.2/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-80-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 501001, "url": "http://patchwork.ozlabs.org/api/1.2/series/501001/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/list/?series=501001", "date": "2026-04-22T12:23:05", "name": "Add NAN PASN pairing support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/501001/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2226426/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226426/checks/", "tags": {}, "related": [], "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=ZOH2qUHQ;\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=desiato.20200630 header.b=JWwaIgwi;\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=JHeEkHFU;\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 4g0z9X5lg6z1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:31:28 +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 1wFWjF-0000000AAiG-3met;\n\tWed, 22 Apr 2026 12:30:53 +0000", "from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWfr-0000000A5yJ-2e00\n\tfor hostap@bombadil.infradead.org;\n\tWed, 22 Apr 2026 12:27:23 +0000", "from mgamail.intel.com ([192.198.163.17])\n\tby desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWfl-0000000BKYa-1tyQ\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:27:21 +0000", "from orviesa010.jf.intel.com ([10.64.159.150])\n by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:26:43 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 05:26:42 -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=qhnyjbx1KXbNJadlVeeTh2nToAPGJFPBa3NIUu4XpdY=; b=ZOH2qUHQY8dTyp\n\tiTz72v5lCyZMkwqb2TDmoHWQgdMd8xR08r4jWq9RyHO14bipjomP65gi6jkMXiuYLrYV7Gi6ONr1E\n\tE0MXVFS0nRx0FOiQ4bSFphVttbhR5bHK8V/rSRaYIimzGK5WVx3jSvKrMH2oM3kVI0S3kEPXd/2y2\n\tGXhnfQ9nYVr6FR+EckUBvIhhTwiYoCKmDUzE3z1I+rJRo18gIq1OFPlU+i3ZFXxkbKSj3GCfmDo3f\n\t7Tkeov7ZjqbR94i3HC5ELBor7/HCuJdpZkZoG7qSnLqbxacFZ6OGWoc68/5BkQu0IlKsQbykt30Il\n\tQxAs/Yo/uEE9KjuA73YA==;", "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version\n\t:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=5s76XBYFTPLE9Wjz+egBa2wovP7qmSeiwG/r9HEgnMQ=; b=JWwaIgwimTP2F9Zel32fGuFXD3\n\tczPmmnnQwHrkvt4PgH30FicTOOjy3TNOF39ZXtgSOKq29u9g8hJ4uN6Pitc8hC005wTKTs4QQy7g/\n\t07vAGMwprQSnXEhX3zRtMC7o/AqYdzJT9T/CTx/FejUgN1DmwZDBjfhJvpMDfH3RyBge/9ZVIWuqc\n\tHwXX/FqtJGoBOMGMWcB9wAkSVWB7DwKENm6D+M3LymMXZv1dRfIbefXKdwIE4yJcMVQ6AcLeGtbIm\n\tQ0M8pHdpIZELejN12Xmy8cecIValSQWYyvCwZwDjJqipxAy2PTmWuw1yXP3xS4ZWDGv45xDGJEcFl\n\tGmp5dZQQ==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860837; x=1808396837;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=5gOwJ3StNV7PiEgZpEkjWTEDy3mxRk+Kp0fiwxEcG9c=;\n b=JHeEkHFUPyqRjc/L29b4/xfQeccLLnTFgmwmhIbf004kPEGXKdZvv2mC\n Uk0Tuh2ChfjJSAAxARuFMtgMk4AtA1t0qxK1K1kJKCUXqB4DTrSZqnB7U\n RhAuep4NGYiLMaQbyAPT/ZpXkVSWDgrDLKpAGGF5PwLKa30Ag01BGbMrJ\n hDM93zAmS4FbFxptsB+ysbMHp1nXFecgCaF10Vba2qPyvoys4U21Sqf6c\n Yk9Ilpsp9tpHgFBsB800M0oSbEnZtOyJ7nPjPIQYm8+vCWOWcpa1rGfSB\n M0KR+60pb6NnSq88kSz/dlWFlDAHtURQuwWbq2/XlSCmxuoqbVy8t3DuU\n w==;" ], "X-CSE-ConnectionGUID": [ "F232af75TF68qkWTnZz0bg==", "ZKu6RX42S7yHw3lZVQVOzw==" ], "X-CSE-MsgGUID": [ "25P/88v2SIehWGQdl0UK7Q==", "rQcOrXbOSIK7HQtrXQYqDg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"77687568\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687568\"", "E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231445288\"" ], "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\tAndrei Otcheretianski <andrei.otcheretianski@intel.com>", "Subject": "[PATCH 79/92] wpa_supplicant: Support NAN pairing abort", "Date": "Wed, 22 Apr 2026 15:24:10 +0300", "Message-ID": "<20260422122424.43776-80-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260422122424.43776-1-andrei.otcheretianski@intel.com>", "References": "<20260422122424.43776-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-20260422_132717_836043_FBF046E5 ", "X-CRM114-Status": "GOOD ( 14.94 )", "X-Spam-Score": "-2.5 (--)", "X-Spam-Report": "Spam detection software,\n running on the system \"desiato.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: NAN pairing doesn't have any internal timeouts/retries as\n in NAN pairing it may take a significant amount of time for the responder\n to be ready. Allow aborting (and restarting) NAN PASN pairing which [...]\n Content analysis details: (-2.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 [192.198.163.17 listed in list.dnswl.org]\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 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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\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": "NAN pairing doesn't have any internal timeouts/retries as in NAN\npairing it may take a significant amount of time for the responder to be\nready. Allow aborting (and restarting) NAN PASN pairing which may be\ntriggered by upper layers.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n src/nan/nan.h | 1 +\n src/nan/nan_pairing.c | 26 ++++++++++++++++++++++++++\n wpa_supplicant/ctrl_iface.c | 3 +++\n wpa_supplicant/nan_supplicant.c | 27 +++++++++++++++++++++++++++\n wpa_supplicant/nan_supplicant.h | 1 +\n wpa_supplicant/wpa_cli.c | 9 +++++++++\n 6 files changed, 67 insertions(+)", "diff": "diff --git a/src/nan/nan.h b/src/nan/nan.h\nindex c1fe905b03..78111a3426 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -745,6 +745,7 @@ int nan_pairing_set_cipher_suites(struct nan_data *nan_data, u32 value);\n int nan_pairing_set_nik(struct nan_data *nan, const u8 *nik, size_t nik_len);\n int nan_pairing_set_nik_lifetime(struct nan_data *nan, u32 lifetime);\n bool nan_pairing_is_peer_paired(struct nan_data *nan_data, const u8 *peer_addr);\n+int nan_pairing_abort(struct nan_data *nan_data, const u8 *peer_addr);\n #else\n static inline int nan_pairing_add_attrs(struct nan_data *nan_data,\n \t\t\t\t\tstruct wpabuf *buf)\ndiff --git a/src/nan/nan_pairing.c b/src/nan/nan_pairing.c\nindex 05a40b9cd4..b468de3bb4 100644\n--- a/src/nan/nan_pairing.c\n+++ b/src/nan/nan_pairing.c\n@@ -95,6 +95,32 @@ void nan_pairing_deinit_peer(struct nan_peer *peer)\n }\n \n \n+int nan_pairing_abort(struct nan_data *nan_data, const u8 *peer_addr)\n+{\n+\tstruct nan_peer *peer;\n+\n+\tpeer = nan_get_peer(nan_data, peer_addr);\n+\tif (!peer) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Pairing abort: Peer \" MACSTR \" not found\",\n+\t\t\t MAC2STR(peer_addr));\n+\t\treturn -1;\n+\t}\n+\n+\tif (!peer->pairing.pasn) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Pairing abort: No PASN in progress with peer \"\n+\t\t\t MACSTR, MAC2STR(peer_addr));\n+\t\treturn -1;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: Aborting pairing with peer \" MACSTR,\n+\t\t MAC2STR(peer_addr));\n+\tnan_pairing_deinit_peer(peer);\n+\treturn 0;\n+}\n+\n+\n static bool nan_pairing_is_supported(struct nan_data *nan_data,\n \t\t\t\t struct nan_peer *peer, u8 auth_mode)\n {\ndiff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c\nindex 78a86f8c89..1096fa228d 100644\n--- a/wpa_supplicant/ctrl_iface.c\n+++ b/wpa_supplicant/ctrl_iface.c\n@@ -14471,6 +14471,9 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,\n \t} else if (os_strncmp(buf, \"NAN_PAIR \", 9) == 0) {\n \t\tif (wpas_nan_pairing_start(wpa_s, buf + 9) < 0)\n \t\t\treply_len = -1;\n+\t} else if (os_strncmp(buf, \"NAN_PAIR_ABORT \", 15) == 0) {\n+\t\tif (wpas_nan_pairing_abort(wpa_s, buf + 15) < 0)\n+\t\t\treply_len = -1;\n #endif /* CONFIG_PASN */\n #endif /* CONFIG_NAN */\n \t} else {\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex af1a21ce63..15db978f2f 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -2997,6 +2997,33 @@ int wpas_nan_pasn_auth_tx_status(struct wpa_supplicant *wpa_s, const u8 *data,\n }\n \n \n+int wpas_nan_pairing_abort(struct wpa_supplicant *wpa_s, const char *cmd)\n+{\n+\tu8 addr[ETH_ALEN];\n+\tstruct nan_data *nan = wpa_s->nan;\n+\n+\tif (!nan) {\n+\t\twpa_printf(MSG_DEBUG, \"NAN_PAIR_ABORT: NAN not initialized\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (hwaddr_aton(cmd, addr)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN_PAIR_ABORT: Invalid peer address: '%s'\", cmd);\n+\t\treturn -1;\n+\t}\n+\n+\tif (nan_pairing_abort(nan, addr) < 0) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN_PAIR_ABORT: Abort failed for peer \" MACSTR,\n+\t\t\t MAC2STR(addr));\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n int wpas_nan_pasn_auth_rx(struct wpa_supplicant *wpa_s,\n \t\t\t const struct ieee80211_mgmt *mgmt, size_t len)\n {\ndiff --git a/wpa_supplicant/nan_supplicant.h b/wpa_supplicant/nan_supplicant.h\nindex 1e5196bca0..d018f3ac8f 100644\n--- a/wpa_supplicant/nan_supplicant.h\n+++ b/wpa_supplicant/nan_supplicant.h\n@@ -41,6 +41,7 @@ int wpas_nan_pair(struct wpa_supplicant *wpa_s, const u8 *peer_addr,\n \t\t u8 auth_mode, int cipher, int handle, u8 peer_instance_id,\n \t\t bool responder, const char *password);\n int wpas_nan_pairing_start(struct wpa_supplicant *wpa_s, char *cmd);\n+int wpas_nan_pairing_abort(struct wpa_supplicant *wpa_s, const char *cmd);\n int wpas_nan_pasn_auth_tx_status(struct wpa_supplicant *wpa_s, const u8 *data,\n \t\t\t\t size_t data_len, bool acked);\n int wpas_nan_pasn_auth_rx(struct wpa_supplicant *wpa_s,\ndiff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c\nindex aec6ac2099..bad4be030d 100644\n--- a/wpa_supplicant/wpa_cli.c\n+++ b/wpa_supplicant/wpa_cli.c\n@@ -3475,6 +3475,12 @@ static int wpa_cli_cmd_nan_pair_start(struct wpa_ctrl *ctrl, int argc,\n {\n \treturn wpa_cli_cmd(ctrl, \"NAN_PAIR\", 5, argc, argv);\n }\n+\n+static int wpa_cli_cmd_nan_pair_abort(struct wpa_ctrl *ctrl, int argc,\n+\t\t\t\t char *argv[])\n+{\n+\treturn wpa_cli_cmd(ctrl, \"NAN_PAIR_ABORT\", 1, argc, argv);\n+}\n #endif /* CONFIG_PASN */\n #endif /* CONFIG_NAN */\n \n@@ -4292,6 +4298,9 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {\n \t{ \"nan_pair\", wpa_cli_cmd_nan_pair_start, NULL,\n \t cli_cmd_flag_none,\n \t \" = <peer_mac> <handle=<service handle>> <peer_instance_id=<peer requestor id>> <auth=<0|1|2>> <cipher=<CCMP|GCMP-256>> [password=<password>] [responder] = Request or authorize NAN pairing with peer\" },\n+\t{ \"nan_pair_abort\", wpa_cli_cmd_nan_pair_abort, NULL,\n+\t cli_cmd_flag_none,\n+\t \" = <peer_mac> = Abort NAN pairing with peer\" },\n #endif /* CONFIG_PASN */\n #endif /* CONFIG_NAN */\n \t{ \"new_random_mac_address\", wpa_cli_cmd_generate_new_mac, NULL,\n", "prefixes": [ "79/92" ] }