{"id":2218845,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218845/?format=json","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.0/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":"<20260401220220.4418-55-andrei.otcheretianski@intel.com>","date":"2026-04-01T22:02:03","name":"[54/71] wpa_supplicant: Manage NDI operstate using per-interface NDP refcount","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"57577541ae903ee46849f59736a50b776e49239e","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.0/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260401220220.4418-55-andrei.otcheretianski@intel.com/mbox/","series":[{"id":498402,"url":"http://patchwork.ozlabs.org/api/1.0/series/498402/?format=json","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/2218845/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=nj779jIU;\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=Y/f6HIPc;\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 4fmK0h1Mmfz1yFv\n\tfor ; Thu, 02 Apr 2026 09:09:56 +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 1w83kZ-0000000GEyf-0iKY;\n\tWed, 01 Apr 2026 22:09:23 +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 1w83hm-0000000G9xK-057Q\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:37 +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:06:08 -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:06:07 -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=xBONlJjUVj1RX8NomC5fLgV0QwuR0CwzhByL/LdBvtA=; b=nj779jIUXvsPi1\n\tiT0kBBk1xs5mob6qhpWhVIzw3nCuulTx7urq3+c13fAjtSvRe9MwFKNeBz66zFPQ/0UieC+J0jRJY\n\tTuFSP/LxmzVL0qIzzcWnVgDmNmwQSERduTjPkP3L/yFruUQ2BepD3dEXEpXkZ00iaJLDV4AaAGzey\n\tz9AYtJFNdx2wqw+74XHYeldDz1kp/hQxolOcLwVfYflg8NN7VlvW98eMag1J1kla2WsmpI1LylA8E\n\tzQLhmlGfiq8fVCSrOA6GRmYtH7HP0CyKY5RSvvGhlYzDyvBEbTADwjtZ9cnHX/ZwePhKk5/8KI14h\n\t2pF3+GMNi75KDzSX6JYA==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081190; x=1806617190;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=gd5B2MtBl2G2IqT25YWKyZdvqYd8+zlK/dtaRt1Usd4=;\n b=Y/f6HIPcoFo636V5ets1/oRqBpz95tINIhD3hXsJqnUa4twzdnq4M3yx\n 4AnppRblQOWF+ktoIel6nJ5uDGd/13nd/ZHV+jRqQGOsG5zr2nczNmw/I\n 1ny2kH/R2ovoyJ6dgzmtTsEleOgqVAOwYffO6WRYXcFq3HGdpjpdwF9kg\n ECwI76/LveSzph1NtUTPIbmFEozW0s8izBMgbLvKEP7N/ibp78YCQG7KM\n owpw3IZvcfnVvcTZgSxm4C9wa947+1o4UnFFlGhLzyj+HZWOD1ijn8RDj\n tgmEvyNGuY8GdlmmqrwWw5ESoMRSwuGG7NDyAIOio4ZKoH9fKGZXzSbec\n Q==;"],"X-CSE-ConnectionGUID":["+SB1g6mZQQmb8/lV6FWVVA==","9J9fNnfOSnGy1eTvwg+Xuw=="],"X-CSE-MsgGUID":["CwvML/KGQ8O/WxCMf9XREA==","sljlMFPGR6ao3tznHyb1nw=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11746\"; a=\"75851651\"","E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851651\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Subject":"[PATCH 54/71] wpa_supplicant: Manage NDI operstate using\n per-interface NDP refcount","Date":"Thu, 2 Apr 2026 01:02:03 +0300","Message-ID":"<20260401220220.4418-55-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_150630_196767_BA31A342 ","X-CRM114-Status":"GOOD ( 15.07 )","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: From: Daniel Gabay A single NDI\n can\n maintain NDPs with multiple peers concurrently. Introduce a per-NDI\n reference\n count to track active NDPs across all peers,\n ensuring correct operstate transitions: \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":"","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: Daniel Gabay \n\nA single NDI can maintain NDPs with multiple peers concurrently.\nIntroduce a per-NDI reference count to track active NDPs across all\npeers, ensuring correct operstate transitions:\n\n- Set UP when the first NDP connects (refcount 0 -> 1)\n- Set DORMANT when the last NDP disconnects (refcount 1 -> 0)\n- Maintain operstate UP while any NDP remains active (refcount > 1)\n\nSigned-off-by: Daniel Gabay \n---\n wpa_supplicant/nan_supplicant.c | 41 ++++++++++++++++++++++++++++---\n wpa_supplicant/wpa_supplicant_i.h | 1 +\n 2 files changed, 39 insertions(+), 3 deletions(-)","diff":"diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex 3a5337bc7b..a00d92cb68 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -493,7 +493,7 @@ static int wpas_nan_add_ndi_sta(struct wpa_supplicant *wpa_s,\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: NDI station added without keys for peer \"\n \t\t\t MACSTR, MAC2STR(peer_ndi));\n-\t\treturn 0;\n+\t\tgoto out_success;\n \t}\n \n \tif (nan_peer_get_tk(wpa_s->nan, peer_nmi, peer_ndi, local_ndi, tk,\n@@ -512,8 +512,28 @@ static int wpas_nan_add_ndi_sta(struct wpa_supplicant *wpa_s,\n \t\treturn -1;\n \t}\n \n-\treturn wpa_drv_sta_set_flags(ndi_wpa_s, peer_ndi, WPA_STA_AUTHORIZED,\n-\t\t\t\t WPA_STA_AUTHORIZED, ~0);\n+\tif (wpa_drv_sta_set_flags(ndi_wpa_s, peer_ndi, WPA_STA_AUTHORIZED,\n+\t\t\t\t WPA_STA_AUTHORIZED, ~0)) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to set authorize for NDI station\");\n+\t\twpas_nan_remove_ndi_keys(ndi_wpa_s, peer_ndi);\n+\t\twpa_drv_sta_remove(ndi_wpa_s, peer_ndi);\n+\t\treturn -1;\n+\t}\n+\n+out_success:\n+\tndi_wpa_s->nan_ndi_ndp_refcount++;\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP refcount incremented to %u (peer_ndi=\" MACSTR\n+\t\t \" peer_nmi=\" MACSTR \")\",\n+\t\t ndi_wpa_s->nan_ndi_ndp_refcount,\n+\t\t MAC2STR(peer_ndi), MAC2STR(peer_nmi));\n+\n+\t/* Set operstate UP only when first NDP is established on this NDI */\n+\tif (ndi_wpa_s->nan_ndi_ndp_refcount == 1)\n+\t\twpa_drv_set_operstate(ndi_wpa_s, 1);\n+\n+\treturn 0;\n }\n \n \n@@ -538,6 +558,21 @@ static void wpas_nan_remove_ndi_sta(struct wpa_supplicant *wpa_s,\n \n \twpas_nan_remove_ndi_keys(ndi_wpa_s, peer_ndi);\n \twpa_drv_sta_remove(ndi_wpa_s, peer_ndi);\n+\n+\tif (!ndi_wpa_s->nan_ndi_ndp_refcount)\n+\t\treturn;\n+\n+\tndi_wpa_s->nan_ndi_ndp_refcount--;\n+\twpa_printf(MSG_DEBUG, \"NAN: NDP refcount decremented to %u (peer_ndi=\"\n+\t\t MACSTR \")\", ndi_wpa_s->nan_ndi_ndp_refcount,\n+\t\t MAC2STR(peer_ndi));\n+\n+\t/* Set operstate DORMANT only when last NDP is removed from\n+\t * this NDI\n+\t */\n+\tif (!ndi_wpa_s->nan_ndi_ndp_refcount)\n+\t\twpa_drv_set_operstate(ndi_wpa_s, 0);\n+\n }\n \n \ndiff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h\nindex 44a7f58c28..22e7c7b4fc 100644\n--- a/wpa_supplicant/wpa_supplicant_i.h\n+++ b/wpa_supplicant/wpa_supplicant_i.h\n@@ -1737,6 +1737,7 @@ struct wpa_supplicant {\n \tu16 nan_supported_csids;\n \tstruct wpa_freq_range_list nan_disallowed_freqs;\n \tu16 nan_max_bw;\n+\tunsigned int nan_ndi_ndp_refcount; /* Active NDP count on this NDI */\n #endif /* CONFIG_NAN */\n #ifdef CONFIG_ENC_ASSOC\n \tbool assoc_resp_encrypted; /* Whether (Re)Association Response frame\n","prefixes":["54/71"]}