{"id":2229849,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229849/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-43-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-43-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:05:43","name":"[42/97] NAN: Add peer's GTK ID to NDP disconnected callback","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"823c29a4ad60079f185853359203caf135cc084c","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-43-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/2229849/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229849/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=tsENKR5C;\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=tYvbb212;\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=YF7r/vlO;\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 4g4s5r1sTSz1xrS\n\tfor ; Wed, 29 Apr 2026 06:11:44 +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 1wHoly-00000002H8D-0LxW;\n\tTue, 28 Apr 2026 20:11:10 +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 1wHojs-00000002EHj-3P8T\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:09:01 +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 1wHojn-00000004NBq-0rdi\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:08:59 +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:20 -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:18 -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=koWesVDZIVlZYC32Q2FCFQzqgna5osUGCTujtKYLBew=; b=tsENKR5C5f+kZJ\n\t9gkxTJym/scIq4DLF0Svx+b3MPefXWmS5V7RGV1LDNZLbSIF4UAiqECpexzUzlo7Op1LFB+7RsgAe\n\taTU1FXAUgUMxAXalm0VVkR65Nto4Kya1VRFRobSx20WfvJKJKlsd0FObi0JYhoKqqgWGXYMEPCpU5\n\tV5pDgvOyT/aGvZ9oRMkx1UnnJ54QJCk0osOdQpCZmD9YgdU3JdBr0smlk78szj1YSeMI2yb3ORI6P\n\tebIPJJWAM6R/3VuT7SKkax5YaQz1OJXBd/kIZWLWhfM4CO6Oy83SZmhHSEXqT2DYvLQXB3Zze9yxr\n\tIWyv9g9LhReX3Lx4IVfA==;","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=/jz7hSGb8iy7dDMACCfin477aI1vMsSD4T/hKjWXpk8=; b=tYvbb212Do/Dr64sVdKi0eeAJp\n\tJiPkFrjusYrDI6KxOPiWm5n4eUGqi+BtbHwWbhXEiJEbU3pEfAkp+qg1K9oPRUJlugtHicbAuD2hg\n\tzfD40qQQCp/aGQHgT90J/YRFApO7qkAS98n3Q/tNuL6MAgdhMq2Qo0marHSI3fFfn27ypJpRyR9je\n\tcuhbLx/xKjJOnenbvd0L9aRLjDthDcQ3ukw61cX+k51j4b8zfPVLFPtQ1Ysvha8mUi/cI58kYE/ap\n\tz+r+OadQPYQZbuK0vJVSz74fDVpMYwqxCJmEF5Q9/b/CO18zVvEY10iz7iNM0ErKg60g0B5CDHm7R\n\t/YKm9hFw==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406935; x=1808942935;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=50Zlwx2HHiMO4AISvGa/tqUo+oq/a7mGAYQrcT2eMsU=;\n b=YF7r/vlOCpF9FYNFzgmg25eW5Ffu/g/YNtZKdjkeUeEA60xiSrQ1WVFz\n xMYQ0w09ZGy7RDRPyqZWr33F6KdhokHzYs1AhRC80ZtiECHYk6/DouB91\n nnOu90XrW618/epyDrSaD3J6JdDyWI0bbkvdoFCaQWWevUk/T2PLIFtIB\n smseyt26toUCrtDKgOFSRSh7+Mr0UNQvKMAslwf4nOX56z2S6X9cco18E\n f9tmVYTPabBm4yh/BXNLviKow4fOCqIuyt4ynKrDuPjBb3UDM5SxkDQuB\n UvoDlwj4c9mKYEX7IHpyJN7leF1pBsswMz8CRUeiJSCrnAsn2H5F/H/v2\n A==;"],"X-CSE-ConnectionGUID":["RkFyO9paQ7yHtB9fgXooQA==","MgPGLDAMTYyk1bCi2XFc1Q=="],"X-CSE-MsgGUID":["F/oyI6DVRrmgske26SQMaw==","xGAfxTs8T6yPpqaqWAg/uQ=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519417\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519417\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610424\""],"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 42/97] NAN: Add peer's GTK ID to NDP disconnected callback","Date":"Tue, 28 Apr 2026 23:05:43 +0300","Message-ID":"<20260428200639.40243-43-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_210855_598670_D7DB63F2 ","X-CRM114-Status":"GOOD ( 13.59 )","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":"","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\nPass the peer's GTK ID in the NDP disconnected event data so the GTK\ncan be removed from the NDI.\n\nSigned-off-by: Avraham Stern \n---\n src/nan/nan.c | 9 +++++----\n src/nan/nan.h | 3 ++-\n src/nan/nan_i.h | 4 +++-\n src/nan/nan_module_tests.c | 4 +++-\n src/nan/nan_ndp.c | 2 +-\n wpa_supplicant/nan_supplicant.c | 2 +-\n 6 files changed, 15 insertions(+), 9 deletions(-)","diff":"diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex f7752f9d84..51ea72e20f 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1657,7 +1657,8 @@ static int nan_ndp_connected(struct nan_data *nan, struct nan_peer *peer)\n \tif (peer->ndp_setup.sec.local_gtk.csid != NAN_CS_NONE)\n \t\tparams.local_gtk = &peer->ndp_setup.sec.local_gtk;\n \n-\tif (peer->ndp_setup.sec.peer_gtk.csid != NAN_CS_NONE) {\n+\tpeer->ndp_setup.ndp->gtk_id = peer->ndp_setup.sec.peer_gtk.id;\n+\tif (peer->ndp_setup.sec.peer_gtk.id) {\n \t\tparams.peer_gtk = &peer->ndp_setup.sec.peer_gtk;\n \t\tparams.peer_gtk_rsc = peer->ndp_setup.sec.peer_gtk_rsc;\n \t}\n@@ -1722,7 +1723,7 @@ static void nan_ndp_disconnected(struct nan_data *nan, struct nan_peer *peer,\n \t\tnan->cfg->ndp_disconnected(nan->cfg->cb_ctx, &ndp_id,\n \t\t\t\t\t local_ndi, peer_ndi, reason,\n \t\t\t\t\t locally_generated, remove_sta,\n-\t\t\t\t\t fail);\n+\t\t\t\t\t fail, peer->ndp_setup.ndp->gtk_id);\n \n \tnan_ndp_setup_stop(nan, peer);\n }\n@@ -2293,7 +2294,7 @@ int nan_handle_ndp_setup(struct nan_data *nan, struct nan_ndp_params *params)\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+\t\t\tconst u8 *peer_ndi, enum nan_reason reason, u8 gtk_id)\n {\n \t/*\n \t * Remove the NDI station only if no other NDP is using the same\n@@ -2305,7 +2306,7 @@ void nan_ndp_terminated(struct nan_data *nan, struct nan_peer *peer,\n \tif (nan->cfg->ndp_disconnected)\n \t\tnan->cfg->ndp_disconnected(nan->cfg->cb_ctx, ndp_id, local_ndi,\n \t\t\t\t\t peer_ndi, reason, false,\n-\t\t\t\t\t remove_sta, false);\n+\t\t\t\t\t remove_sta, false, gtk_id);\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)\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 37af4262c2..cf7db9b3b7 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -530,6 +530,7 @@ struct nan_config {\n \t * using the same peer NDI)\n \t * @failure: true if NDP setup failed (before connected), false if\n \t * graceful disconnection after NDP was established\n+\t * @gtk_id: GTK key ID used for the NDP; 0 if no GTK should be removed\n \t *\n \t * This callback notifies that an NDP has been disconnected. When\n \t * @failure is true, NDP setup failed before connection was established.\n@@ -540,7 +541,7 @@ struct nan_config {\n \t\t\t\t const u8 *local_ndi, const u8 *peer_ndi,\n \t\t\t\t enum nan_reason reason,\n \t\t\t\t bool locally_generated, bool remove_sta,\n-\t\t\t\t bool failure);\n+\t\t\t\t bool failure, u8 gtk_id);\n \n \t/**\n \t * get_chans - Get the prioritized allowed channel information to be\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 772971ba84..592268aa4a 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -144,6 +144,7 @@ enum nan_ndp_state {\n * @resp_ndi: Responder NDI. Might not always be set (as this depends on the\n * state of NDP establishment and the status).\n * @qos: QoS requirements for this NDP\n+ * @gtk_id: GTK key ID used for this NDP. 0 if GTK is not used\n */\n struct nan_ndp {\n \t/* for nan_peer ndps list */\n@@ -155,6 +156,7 @@ struct nan_ndp {\n \tu8 resp_ndi[ETH_ALEN];\n \n \tstruct nan_qos qos;\n+\tu8 gtk_id;\n };\n \n /*\n@@ -766,7 +768,7 @@ struct bitfield * nan_avail_entries_to_bf(struct nan_data *nan,\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+\t\t\tconst u8 *peer_ndi, enum nan_reason reason, u8 gtk_id);\n int nan_crypto_pmk_to_ptk(const u8 *pmk, const u8 *iaddr, const u8 *raddr,\n \t\t\t const u8 *inonce, const u8 *rnonce,\n \t\t\t struct nan_ptk *ptk,\ndiff --git a/src/nan/nan_module_tests.c b/src/nan/nan_module_tests.c\nindex 43b8a57c45..61d126d46e 100644\n--- a/src/nan/nan_module_tests.c\n+++ b/src/nan/nan_module_tests.c\n@@ -642,6 +642,7 @@ static int nan_test_ndp_connected_cb(void *ctx,\n * @locally_generated: true if locally generated, false if triggered by peer\n * @remove_sta: true if the NDI station should be removed\n * @failure: true if NDP setup failed, false if graceful disconnection\n+ * @gtk_id: GTK key ID used for the NDP; 0 if no GTK was used\n *\n * The handling of the event is done asynchronously through the NAN test actions\n * processing.\n@@ -652,7 +653,8 @@ static void nan_test_ndp_disconnected_cb(void *ctx, struct nan_ndp_id *ndp_id,\n \t\t\t\t\t enum nan_reason reason,\n \t\t\t\t\t bool locally_generated,\n \t\t\t\t\t bool remove_sta,\n-\t\t\t\t\t bool failure)\n+\t\t\t\t\t bool failure,\n+\t\t\t\t\t u8 gtk_id)\n {\n \tstruct nan_device *dev = ctx;\n \ndiff --git a/src/nan/nan_ndp.c b/src/nan/nan_ndp.c\nindex e6f790b7c6..354541dd77 100644\n--- a/src/nan/nan_ndp.c\n+++ b/src/nan/nan_ndp.c\n@@ -768,7 +768,7 @@ static int nan_ndp_attr_handle_term(struct nan_data *nan, struct nan_peer *peer,\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+\t\t\t ndp_attr->reason_code, pndp->gtk_id);\n \n \tos_free(pndp);\n \ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 94a6aa1f0d..daaf19f78d 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -638,7 +638,7 @@ static void wpas_nan_ndp_disconnected_cb(void *ctx, struct nan_ndp_id *ndp_id,\n \t\t\t\t\t enum nan_reason reason,\n \t\t\t\t\t bool locally_generated,\n \t\t\t\t\t bool remove_sta,\n-\t\t\t\t\t bool failure)\n+\t\t\t\t\t bool failure, u8 gtk_id)\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n \n","prefixes":["42/97"]}