Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2218824/?format=api
{ "id": 2218824, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2218824/?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": "<20260401220220.4418-36-andrei.otcheretianski@intel.com>", "date": "2026-04-01T22:01:44", "name": "[35/71] NAN: Make ndp_connected() callback return int", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "756bc618f1e151107354c97239832ab00bcce5de", "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/20260401220220.4418-36-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 498402, "url": "http://patchwork.ozlabs.org/api/1.0/series/498402/?format=api", "date": "2026-04-01T22:01:09", "name": "NAN Data Path and Bootstrapping support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498402/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218824/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=XgCDY0Gd;\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=gRoYPmjg;\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 4fmJyL6K2gz1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:07:54 +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 1w83iU-0000000GCK0-3BQL;\n\tWed, 01 Apr 2026 22:07:14 +0000", "from mgamail.intel.com ([198.175.65.20])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hC-0000000G9xK-1yQm\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:05:57 +0000", "from fmviesa003.fm.intel.com ([10.60.135.143])\n by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:50 -0700", "from iapp347.iil.intel.com (HELO 87c02287900a.iil.intel.com)\n ([10.167.28.6])\n by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 01 Apr 2026 15:05:49 -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:To:From:Reply-To:Cc:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=KKgw2hC/Xn30vgk+rrxZGMX0Cgn3Pf7RvFeEqxWO28M=; b=XgCDY0Gdy+buDz\n\txsweoA2Bob2LxORXuYBsrx9NvIiQCsFbt0o7KJKZgsEtXGhc7zsj1cuglQUwTSCxhqAkZ0RNGzhnW\n\tDVZSPpqowGFqp+aqDd9Gxw1+mhlIK4zEaPXWZW29XL5bTZLm6C5kPNJ8/feMfE5uc4F3poIv3Od6P\n\tNGbLR6hQM9+ioWrpNAOZTPXZ/2S20k3GtxFZAlpGDkcFPYyOFca1zfIFCEFlVsh+aBmp1tiBDZYj2\n\tGjNN6Fds9dGhUfyMx0C0bhmvtvawjn2PWskaXBblN8sop7nKZacTY+03EJTDMQSv2M/RWWUMxa41o\n\thxvzf7Dor22TRzV+1B9A==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081154; x=1806617154;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=OTvmUaVdRS0tM6xMOazsr3sSTEi8SX/QXz4mu1CCiLM=;\n b=gRoYPmjggqAgqcKxFmHbzbWjLFLzDDavyAjFjkv8gm5SNQkn2WN5Lzm0\n wZJ4dQZJZjsZ+C21IoQ5KFaPdOTREqe6uzL25jqpJAr/VXGFoaGj7RYa2\n 5aDuV6fy5lCLlvlKrG7Y/Ns48b/ZefvhczrAf1wvyZQ+dp8WqhcgIT+jc\n pyMlkbonleVDlMUdLP5XiEv0xvv10iC+0pACYbktPy5B1FZ+YDxce6EpI\n VXKBluS4RELw1Zw595PxDfNjlNnJtM/EwcN6ERVMHG6vWXhbb/rM69cBf\n zsD6H08VyyiVPUwofkttwDpDfX2LLto+2QxiYwc+h9PniS9+wu7tuHPwu\n w==;" ], "X-CSE-ConnectionGUID": [ "mE+mQwTHTLSGvm735LSakg==", "fRoqI7gAQLeCbO2brLWCaA==" ], "X-CSE-MsgGUID": [ "KoCMrgH7Qa2IWY4l6CZkbw==", "mPmtU+QlRfW8aQKoVST1WQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11746\"; a=\"75851621\"", "E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851621\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Subject": "[PATCH 35/71] NAN: Make ndp_connected() callback return int", "Date": "Thu, 2 Apr 2026 01:01:44 +0300", "Message-ID": "<20260401220220.4418-36-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260401220220.4418-1-andrei.otcheretianski@intel.com>", "References": "<20260401220220.4418-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-20260401_150554_667912_278AEE66 ", "X-CRM114-Status": "GOOD ( 13.97 )", "X-Spam-Score": "-1.9 (-)", "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: ndp_connected() callback is used to notify upper layers\n about\n NDP establishment. Allow this callback to fail. This is needed to allow\n proper\n NDP tear down in case upper layers fail to configure the ne [...]\n Content analysis details: (-1.9 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.20 listed in list.dnswl.org]\n 1.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.20 listed in\n bl.score.senderscore.com]\n 1.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.20 listed in\n sa-trusted.bondedsender.org]\n 1.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.20 listed in sa-accredit.habeas.com]\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_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.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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.5 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": "ndp_connected() callback is used to notify upper layers about NDP\nestablishment. Allow this callback to fail.\nThis is needed to allow proper NDP tear down in case upper layers fail\nto configure the newly established NDP connection.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n src/nan/nan.c | 20 +++++++++++++++-----\n src/nan/nan.h | 6 ++++--\n src/nan/nan_module_tests.c | 11 +++++++----\n wpa_supplicant/nan_supplicant.c | 9 ++++++---\n 4 files changed, 32 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex f202f97b89..6b0bd2b6fd 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1254,7 +1254,7 @@ static void nan_ndp_action_notif(struct nan_data *nan, struct nan_peer *peer)\n }\n \n \n-static void nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n+static int nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n {\n \tstruct nan_ndp_connection_params params;\n \n@@ -1280,14 +1280,20 @@ static void nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n \n \tnan_sec_ndp_store_keys(nan, peer, params.peer_ndi, params.local_ndi);\n \n-\tif (nan->cfg->ndp_connected)\n-\t\tnan->cfg->ndp_connected(nan->cfg->cb_ctx, ¶ms);\n+\tif (nan->cfg->ndp_connected &&\n+\t nan->cfg->ndp_connected(nan->cfg->cb_ctx, ¶ms)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP connected notification failed\");\n+\t\treturn -1;\n+\t}\n \n \t/* Move the NDP to the list of tracked NDPs */\n \tdl_list_add(&peer->ndps, &peer->ndp_setup.ndp->list);\n \tpeer->ndp_setup.ndp = NULL;\n \n \tnan_ndp_setup_stop(nan, peer);\n+\n+\treturn 0;\n }\n \n \n@@ -1411,7 +1417,9 @@ static int nan_action_rx_ndp(struct nan_data *nan, struct nan_peer *peer,\n \t peer->ndl->state == NAN_NDL_STATE_DONE) {\n \t\twpa_printf(MSG_DEBUG, \"NAN: NAF: NDP setup done\");\n \n-\t\tnan_ndp_connected(nan, peer);\n+\t\tif (nan_ndp_connected(nan, peer))\n+\t\t\tnan_ndp_disconnected(nan, peer,\n+\t\t\t\t\t NAN_REASON_UNSPECIFIED_REASON);\n \t\treturn 0;\n \t}\n \n@@ -1583,7 +1591,9 @@ 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\tnan_ndp_connected(nan, peer);\n+\t\tif (nan_ndp_connected(nan, peer))\n+\t\t\tnan_ndp_disconnected(nan, peer,\n+\t\t\t\t\t NAN_REASON_UNSPECIFIED_REASON);\n \t}\n \n \treturn 0;\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 46525e2158..c6f06382c3 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -427,9 +427,11 @@ struct nan_config {\n \t * ndp_connected - Notify that NDP was successfully connected\n \t * @ctx: Callback context from cb_ctx\n \t * @params: NDP connection parameters\n+\t *\n+\t * Returns: 0 on success, -1 on failure.\n \t */\n-\tvoid (*ndp_connected)(void *ctx,\n-\t\t\t struct nan_ndp_connection_params *params);\n+\tint (*ndp_connected)(void *ctx,\n+\t\t\t struct nan_ndp_connection_params *params);\n \n \t/**\n \t * ndp_disconnected - Notify that NDP was disconnected\ndiff --git a/src/nan/nan_module_tests.c b/src/nan/nan_module_tests.c\nindex 80e32b1b63..9fc0064308 100644\n--- a/src/nan/nan_module_tests.c\n+++ b/src/nan/nan_module_tests.c\n@@ -587,16 +587,16 @@ nan_test_ndp_action_notfi_cb(void *ctx,\n * @params: NDP action notification parameters\n *\n * The handling of the event is done asynchronously through the NAN test actions\n- * processing.\n+ * processing. Returns 0 on success, -1 on failure.\n */\n-static void nan_test_ndp_connected_cb(void *ctx,\n-\t\t\t\t struct nan_ndp_connection_params *params)\n+static int nan_test_ndp_connected_cb(void *ctx,\n+\t\t\t\t struct nan_ndp_connection_params *params)\n {\n \tstruct nan_device *dev = ctx;\n \tstruct nan_peer_schedule sched;\n \tstruct nan_peer_potential_avail pot;\n \n-\tDEV_NOT_INIT_ERR_VOID(dev);\n+\tDEV_NOT_INIT_ERR(dev);\n \n \twpa_printf(MSG_INFO,\n \t\t \"%s: %s: Enter. local_ndi=\" MACSTR \" peer_ndi=\" MACSTR,\n@@ -618,6 +618,7 @@ static void nan_test_ndp_connected_cb(void *ctx,\n \t\t\t\t dev->name, dev->csid,\n \t\t\t\t dev->conf->ndp_confs[dev->n_ndps].\n \t\t\t\t expected_csid);\n+\t\t\treturn -1;\n \t\t}\n \t}\n \n@@ -625,6 +626,8 @@ static void nan_test_ndp_connected_cb(void *ctx,\n \t\t\t 0, params->ssi, params->ssi_len, NAN_CS_NONE, NULL);\n \n \tdev->connected_notify_received = true;\n+\n+\treturn 0;\n }\n \n \ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 6973bccc39..f89c98753b 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -213,8 +213,8 @@ static void wpas_nan_ndp_action_notif_cb(void *ctx,\n }\n \n \n-static void wpas_nan_ndp_connected_cb(void *ctx,\n-\t\t\t\t struct nan_ndp_connection_params *params)\n+static int wpas_nan_ndp_connected_cb(void *ctx,\n+\t\t\t\t struct nan_ndp_connection_params *params)\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n \tchar *ssi_hex = NULL;\n@@ -222,7 +222,8 @@ static void wpas_nan_ndp_connected_cb(void *ctx,\n \tif (params->ssi) {\n \t\tssi_hex = os_zalloc(2 * params->ssi_len + 1);\n \t\tif (!ssi_hex)\n-\t\t\treturn;\n+\t\t\treturn -1;\n+\n \t\twpa_snprintf_hex(ssi_hex, 2 * params->ssi_len + 1, params->ssi,\n \t\t\t\t params->ssi_len);\n \t}\n@@ -234,6 +235,8 @@ static void wpas_nan_ndp_connected_cb(void *ctx,\n \t\t MAC2STR(params->local_ndi), MAC2STR(params->peer_ndi),\n \t\t ssi_hex ? ssi_hex : \"\");\n os_free(ssi_hex);\n+\n+ return 0;\n }\n \n \n", "prefixes": [ "35/71" ] }