{"id":2226358,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2226358/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-7-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422122424.43776-7-andrei.otcheretianski@intel.com>","list_archive_url":null,"date":"2026-04-22T12:22:57","name":"[06/92] nl80211: Track cookies for NAN Device action frames","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8e737d2634d866d5e1c7f3d1c0e5a34a569a3f71","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.2/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260422122424.43776-7-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501001,"url":"http://patchwork.ozlabs.org/api/1.2/series/501001/?format=json","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/2226358/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226358/checks/","tags":{},"related":[],"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=NF5wJ/4t;\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=CBJSWndQ;\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 4g0z2h5mqwz1yJZ\n\tfor ; Wed, 22 Apr 2026 22:25:30 +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 1wFWdJ-0000000A2PY-3qdw;\n\tWed, 22 Apr 2026 12:24:45 +0000","from mgamail.intel.com ([192.198.163.17])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wFWdI-0000000A2MF-0Ijf\n\tfor hostap@lists.infradead.org;\n\tWed, 22 Apr 2026 12:24:45 +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:24: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:24:43 -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=UDKTTtJa0tC0mLB8coTdJ+iRyU9mTGfEZuaLDahQwXg=; b=NF5wJ/4t3YVQoe\n\tM7EDEFO4Cm+VPncyhjbY3I792mdn8d4H5FCfS7MeD2Pij3y9yim3JbylCw1ZsnvKBzXKsyuw0Zhf9\n\t8cATnee25ZvqiEehjcNBy4GNOxSsIGOoc7nMcHSCU1ZuZiM+cb8hIW2FZjj6ybGYKqF0EFaMVJoTu\n\tW7xnm69wx4MweZsD5T9RHvEpf70EjqBRupTGpK1jEZwTHSUcrm44UB5v40T9gAoDwZjMeLHzM+F2o\n\tdyj/2Y+XHEgbQlAT2G1DR6WRFNmno+zyZuKoROzndiSKWodTjD01gYFpPWCaVmCujZN7aBEJOsY+s\n\t5g6ZpUCbZ+LtNRAh31Xw==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776860684; x=1808396684;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=mBWY1q2fdPbkhL405pTYDFf1BRmdrkWgMEu0je4QhFw=;\n b=CBJSWndQ8xKi4KZKwt+DDNZzjtowUCKreYDV7lJzzspkdumH4nTkieHX\n YZlMwC3I4BolHVcCbyXl/o6qDGkD3JDm+gBra9a0fNxhVRmP5b49PBG+1\n KLyaceAkqKRcHsCJBZsGTlR+TvdBPTz+TMf7fym9A0vSiqlj2Q8fc2x6q\n 9hZZfF/d7Yme2SbVv+Km4F09HDf4bbtKYCuIy0RPhkjZ39xGz/10iPJIJ\n 0E2hAsd4vk2wsLjLGmWZJuVqbb+edFcknBz3hK+LLmnKExz3uwtPa+Fac\n s81CWmCWYHiXJAvRli64cW9DW8/U+5ZVpVtZbl9EW1R1lnvMS6f3IE6Xk\n Q==;"],"X-CSE-ConnectionGUID":["VdkUDDTRTL2tt+ofDTTNmQ==","06mYQWdSRuO6HOOFuqgqvw=="],"X-CSE-MsgGUID":["MsWjPq7+Tzutx3zjvFdIHQ==","IRmLjT+NRimkX+qlHfDF6A=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11764\"; a=\"77687101\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"77687101\"","E=Sophos;i=\"6.23,192,1770624000\";\n d=\"scan'208\";a=\"231444831\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Cc":"vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tIlan Peer ","Subject":"[PATCH 06/92] nl80211: Track cookies for NAN Device action frames","Date":"Wed, 22 Apr 2026 15:22:57 +0300","Message-ID":"<20260422122424.43776-7-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_052444_127080_3E7275E8 ","X-CRM114-Status":"GOOD ( 19.16 )","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 Multiple action\n frames\n can be sent over a NAN Device interface simultaneously,\n especially in cases\n that the NAN Discovery Engine (DE) is not managed in the device.\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 [192.198.163.17 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_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_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":"","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: Ilan Peer \n\nMultiple action frames can be sent over a NAN Device interface\nsimultaneously, especially in cases that the NAN Discovery\nEngine (DE) is not managed in the device.\n\nAs the cookie tracking for ACK processing was only tracking\nthe last sent action frame, Tx status events for previously\nsent action frames where not forwarded for processing in\nhigher layers (due to a cookie mismatch).\n\nFix this by extending the existing tracking of cookies for\nwait cancellation to also track multiple cookies for NAN Device.\n\nSigned-off-by: Ilan Peer \n---\n src/drivers/driver_nl80211.c | 23 ++++++++++++++-----\n src/drivers/driver_nl80211_event.c | 37 +++++++++++++++++++++++++++---\n 2 files changed, 51 insertions(+), 9 deletions(-)","diff":"diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c\nindex e87aecc58d..6394844341 100644\n--- a/src/drivers/driver_nl80211.c\n+++ b/src/drivers/driver_nl80211.c\n@@ -9770,14 +9770,21 @@ static int nl80211_send_frame_cmd(struct i802_bss *bss,\n \t\t\t \"cookie 0x%llx\", no_ack ? \" (no ACK)\" : \"\",\n \t\t\t (long long unsigned int) cookie);\n \n-\t\tif (save_cookie)\n-\t\t\tdrv->send_frame_cookie = no_ack ? (u64) -1 : cookie;\n+\t\tif (drv->nlmode == NL80211_IFTYPE_NAN_DATA || no_ack)\n+\t\t\tdrv->send_frame_cookie = (u64)-1;\n+\t\telse if (save_cookie)\n+\t\t\tdrv->send_frame_cookie = cookie;\n \n-\t\tif (!wait) {\n-\t\t\t /* There is no need to store this cookie since there\n-\t\t\t * is no wait that could be canceled later. */\n+\t\t/*\n+\t\t * Store the cookie only in case there is a wait that needs to\n+\t\t * be cancelled later or in case of a NAN Device interface,\n+\t\t * where multiple action frames might be sent, specifically in\n+\t\t * cases that the NAN Discovery Engine (NAN DE) is not managed\n+\t\t * by the device.\n+\t\t */\n+\t\tif (!wait && drv->nlmode != NL80211_IFTYPE_NAN)\n \t\t\tgoto fail;\n-\t\t}\n+\n \t\tif (drv->num_send_frame_cookies == MAX_SEND_FRAME_COOKIES) {\n \t\t\twpa_printf(MSG_DEBUG,\n \t\t\t\t \"nl80211: Drop oldest pending send frame cookie 0x%llx\",\n@@ -9911,6 +9918,10 @@ static void wpa_driver_nl80211_send_action_cancel_wait(void *priv)\n \tunsigned int i;\n \tu64 cookie;\n \n+\t/* As there are no waits for NAN Device, nothing to do here */\n+\tif (drv->nlmode == NL80211_IFTYPE_NAN)\n+\t\treturn;\n+\n \t/* Cancel the last pending TX cookie */\n \tif (drv->send_frame_cookie != (u64) -1)\n \t\tnl80211_frame_wait_cancel(bss, drv->send_frame_cookie);\ndiff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c\nindex 2fa1035554..fe991b0b39 100644\n--- a/src/drivers/driver_nl80211_event.c\n+++ b/src/drivers/driver_nl80211_event.c\n@@ -1500,15 +1500,46 @@ static void mlme_event_mgmt_tx_status(struct i802_bss *bss,\n \n \tif (!is_ap_interface(drv->nlmode) &&\n \t WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_ACTION) {\n+\t\tbool known = false;\n+\n \t\tif (!cookie)\n \t\t\treturn;\n \n+\t\tif (cookie_val == drv->send_frame_cookie) {\n+\t\t\tknown = true;\n+\t\t\tdrv->send_frame_cookie = (u64)-1;\n+\t\t}\n+\n+\t\tif (drv->nlmode == NL80211_IFTYPE_NAN &&\n+\t\t drv->num_send_frame_cookies > 0) {\n+\t\t\tunsigned int i;\n+\n+\t\t\t/*\n+\t\t\t * Check the cookie is stored for previously sent\n+\t\t\t * frames. If it is found, remove it and in case of NAN\n+\t\t\t * mark it as known\n+\t\t\t */\n+\t\t\tfor (i = 0; i < drv->num_send_frame_cookies; i++) {\n+\t\t\t\tif (cookie_val != drv->send_frame_cookies[i])\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (i < drv->num_send_frame_cookies - 1)\n+\t\t\t\t\tos_memmove(&drv->send_frame_cookies[i],\n+\t\t\t\t\t\t &drv->send_frame_cookies[i + 1],\n+\t\t\t\t\t\t (drv->num_send_frame_cookies - i - 1) * sizeof(u64));\n+\n+\t\t\t\tdrv->num_send_frame_cookies--;\n+\t\t\t\tknown = true;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"nl80211: Frame TX status: cookie=0x%llx%s (ack=%d)\",\n \t\t\t (long long unsigned int) cookie_val,\n-\t\t\t cookie_val == drv->send_frame_cookie ?\n-\t\t\t \" (match)\" : \" (unknown)\", ack != NULL);\n-\t\tif (cookie_val != drv->send_frame_cookie)\n+\t\t\t known ? \" (match)\" : \" (unknown)\", ack != NULL);\n+\n+\t\tif (!known)\n \t\t\treturn;\n \t} else if (!is_ap_interface(drv->nlmode) &&\n \t\t WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_AUTH) {\n","prefixes":["06/92"]}