Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2218839/?format=api
{ "id": 2218839, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2218839/?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-49-andrei.otcheretianski@intel.com>", "date": "2026-04-01T22:01:57", "name": "[48/71] wpa_supplicant: Configure NAN data station", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "bf85245e4c559602a823980fd9778b75c098f701", "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-49-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/2218839/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=0oKDRnlQ;\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=L9pxaLKb;\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 4fmJzw3dvTz1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:09:16 +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 1w83jj-0000000GE1w-2vNN;\n\tWed, 01 Apr 2026 22:08:33 +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 1w83hW-0000000G9s8-3Jua\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:26 +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:02 -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:02 -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=l16s040uBnWBVTD7Jy1rM+353nQ6RmeEtAiYN/GCpZM=; b=0oKDRnlQkqCHwB\n\tM++tNmewlBQFE80K61lEiPwVCV9FuiuA1ThgqQQkyBwWpTmB27GyXTh28Ft8YRH7+eP84j3BDXRmj\n\tcc2ZzHLFfEhctI2Hnlhdt/3l+Yjsk43Tj2bjnSmPsme400rs+X7DObpwmUAGmxhNrl8wT+MoVbRth\n\tyWsz34p3vwjb6iKpARm+IyymMQS5oTb0WIaNMI8R0mJ112+AxvI0y+Gqsp1Nd5GufpkciWRLXExlX\n\tVdI+vmHu7ULEaJRxlIuQ3yhpjFQgWtw1+YKxPRQ6yLiBuaUg8Y7k6SJwr3q7L3CoCCr2uatB06Zrv\n\tpXNwGH9k8uRlzFO1r/eQ==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081174; x=1806617174;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=3MZwlHkwestm77nfpfvioZEY+mpVPHObkZAdTmgayXk=;\n b=L9pxaLKbWSyAXHnrk826f9nUrMCNCmT1aUsWV0o9i06TyCwUXgqfnDrH\n Ahn03tavaH7DlP+wn4kGmvAs8nSSYH4/O4MYMKqkj8tMVslSj9OggPq+h\n joYWjibjJd/CitQw85eP39WUdExYaCEPDaizt2AkvqF5z83yV9QoTUbrj\n Kbnns/PLuZTaLPIrnp2qWFK5JDv2GJHzudkb8EqaN4JHckQPoxVURBOhv\n yOyJOlUFV9KyU2YHVS6nOzCw/YwwN74cze++NVv1YBo3m+xHFe8K1ZWUm\n U13uabw7xp8s6SygBUkPITUnpXfv2kUPQMMBLjwJSurH1AoE70wW2jecX\n w==;" ], "X-CSE-ConnectionGUID": [ "EfSipiKPQUGYKFxD4rNcHg==", "6VEr7EiyStaOStEcoWYq0A==" ], "X-CSE-MsgGUID": [ "cAzSlUKdRZqaRNIED9JLyg==", "v64/mIm3Rt+BiwGmutOFSA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11746\"; a=\"75851643\"", "E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851643\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Subject": "[PATCH 48/71] wpa_supplicant: Configure NAN data station", "Date": "Thu, 2 Apr 2026 01:01:57 +0300", "Message-ID": "<20260401220220.4418-49-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_150614_954144_43A613A7 ", "X-CRM114-Status": "GOOD ( 15.99 )", "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: Add/remove NDI station upon NDP connected/disconnected\n notification\n and install keys in case of secure connection. Signed-off-by: Andrei\n Otcheretianski\n <andrei.otcheretianski@intel.com> --- wpa_supplicant/nan_supplicant.c |\n 201\n ++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+)\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_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 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 -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": "Add/remove NDI station upon NDP connected/disconnected notification and\ninstall keys in case of secure connection.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\n---\n wpa_supplicant/nan_supplicant.c | 201 ++++++++++++++++++++++++++++++++\n 1 file changed, 201 insertions(+)", "diff": "diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex febbd512d4..3a5337bc7b 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -350,12 +350,212 @@ static void wpas_nan_ndp_action_notif_cb(void *ctx,\n }\n \n \n+static int wpas_nan_set_ndi_keys(struct wpa_supplicant *wpa_s,\n+\t\t\t\t const u8 *ndi_addr,\n+\t\t\t\t enum nan_cipher_suite_id csid,\n+\t\t\t\t const u8 *tk, size_t tk_len)\n+{\n+\tenum wpa_alg alg;\n+\tu8 rsc[6];\n+\n+\tos_memset(rsc, 0, sizeof(rsc));\n+\tswitch (csid) {\n+\tcase NAN_CS_SK_CCM_128:\n+\t\talg = WPA_ALG_CCMP;\n+\t\tbreak;\n+\tcase NAN_CS_SK_GCM_256:\n+\t\talg = WPA_ALG_GCMP_256;\n+\t\tbreak;\n+\tdefault:\n+\t\twpa_printf(MSG_ERROR, \"NAN: Unsupported CSID %d for NDI keys\",\n+\t\t\t csid);\n+\t\treturn -1;\n+\t}\n+\n+\treturn wpa_drv_set_key(wpa_s, -1, alg, ndi_addr, 0, 1,\n+\t\t\t rsc, sizeof(rsc), tk, tk_len,\n+\t\t\t KEY_FLAG_PAIRWISE);\n+}\n+\n+\n+static int wpas_nan_remove_ndi_keys(struct wpa_supplicant *wpa_s,\n+\t\t\t\t const u8 *ndi_addr)\n+{\n+\treturn wpa_drv_set_key(wpa_s, -1, WPA_ALG_NONE, ndi_addr, 0, 0,\n+\t\t\t NULL, 0, NULL, 0,\n+\t\t\t KEY_FLAG_PAIRWISE);\n+}\n+\n+\n+static struct wpa_supplicant *\n+wpas_nan_get_ndi_iface(struct wpa_supplicant *wpa_s, const u8 *ndi_addr)\n+{\n+\tstruct wpa_supplicant *ndi_wpa_s;\n+\n+\tfor (ndi_wpa_s = wpa_s->global->ifaces; ndi_wpa_s;\n+\t ndi_wpa_s = ndi_wpa_s->next) {\n+\t\tif (!ndi_wpa_s->nan_data ||\n+\t\t os_memcmp(ndi_wpa_s->own_addr, ndi_addr, ETH_ALEN))\n+\t\t\tcontinue;\n+\n+\t\treturn ndi_wpa_s;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+\n+static int wpas_nan_configure_nmi_sta_capa(struct wpa_supplicant *wpa_s,\n+\t\t\t\t\t const u8 *nmi_addr)\n+{\n+\tstruct hostapd_sta_add_params sta_params;\n+\tconst u8 *ie;\n+\tu8 *elems;\n+\tint elems_len;\n+\n+\telems_len = nan_get_peer_elems(wpa_s->nan, nmi_addr, &elems);\n+\tif (elems_len < 0) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to get peer elems for NMI station\");\n+\t\treturn -1;\n+\t}\n+\n+\tos_memset(&sta_params, 0, sizeof(sta_params));\n+\tsta_params.addr = nmi_addr;\n+\tsta_params.set = 1;\n+\tsta_params.flags = WPA_STA_AUTHORIZED;\n+\tsta_params.flags_mask = sta_params.flags;\n+\n+\tie = get_ie(elems, elems_len, WLAN_EID_HT_CAP);\n+\tif (!ie) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: No HT capabilities in peer elems for NMI station\");\n+\t\treturn -1;\n+\t}\n+\n+\tsta_params.ht_capabilities = (const void *)(ie + 2);\n+\tie = get_ie(elems, elems_len, WLAN_EID_VHT_CAP);\n+\tsta_params.vht_capabilities = ie ? (const void *)(ie + 2) : NULL;\n+\n+\treturn wpa_drv_sta_add(wpa_s, &sta_params);\n+}\n+\n+\n+static int wpas_nan_add_ndi_sta(struct wpa_supplicant *wpa_s,\n+\t\t\t\tconst u8 *peer_nmi, const u8 *local_ndi,\n+\t\t\t\tconst u8 *peer_ndi, bool install_keys,\n+\t\t\t\tbool first_ndp)\n+{\n+\tu8 tk[WPA_TK_MAX_LEN];\n+\tsize_t tk_len;\n+\tenum nan_cipher_suite_id csid;\n+\tstruct wpa_supplicant *ndi_wpa_s;\n+\tstruct hostapd_sta_add_params sta_params;\n+\n+\tndi_wpa_s = wpas_nan_get_ndi_iface(wpa_s, local_ndi);\n+\tif (!ndi_wpa_s) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: No NDI interface found for addr \" MACSTR,\n+\t\t\t MAC2STR(local_ndi));\n+\t\treturn -1;\n+\t}\n+\n+\t/* HT/VHT capabilities are configured per NMI station only for\n+\t * the first NDP. After that it is assumed that capablities are not\n+\t * changing.\n+\t */\n+\tif (first_ndp &&\n+\t wpas_nan_configure_nmi_sta_capa(wpa_s, peer_nmi)) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to configure NMI station capabilities\");\n+\t\treturn -1;\n+\t}\n+\n+\tos_memset(&sta_params, 0, sizeof(sta_params));\n+\tsta_params.addr = peer_ndi;\n+\tsta_params.nmi_addr = peer_nmi;\n+\tsta_params.flags = WPA_STA_AUTHENTICATED | WPA_STA_ASSOCIATED;\n+\n+\t/* Set MFP flag early, to prevent races until keys are installed */\n+\tif (install_keys)\n+\t\tsta_params.flags |= WPA_STA_MFP;\n+\telse\n+\t\tsta_params.flags |= WPA_STA_AUTHORIZED;\n+\n+\tif (wpa_drv_sta_add(ndi_wpa_s, &sta_params)) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to add NDI station for peer \" MACSTR,\n+\t\t\t MAC2STR(peer_ndi));\n+\t\treturn -1;\n+\t}\n+\n+\tif (!install_keys) {\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}\n+\n+\tif (nan_peer_get_tk(wpa_s->nan, peer_nmi, peer_ndi, local_ndi, tk,\n+\t\t\t &tk_len, &csid)) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to get TK for NDI station\");\n+\t\twpa_drv_sta_remove(ndi_wpa_s, peer_ndi);\n+\t\treturn -1;\n+\t}\n+\n+\tif (wpas_nan_set_ndi_keys(ndi_wpa_s, peer_ndi, csid, tk, tk_len)) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to set NDI keys for peer \" MACSTR,\n+\t\t\t MAC2STR(peer_ndi));\n+\t\twpa_drv_sta_remove(ndi_wpa_s, peer_ndi);\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+}\n+\n+\n+static void wpas_nan_remove_ndi_sta(struct wpa_supplicant *wpa_s,\n+\t\t\t\t const u8 *local_ndi,\n+\t\t\t\t const u8 *peer_ndi)\n+{\n+\tstruct wpa_supplicant *ndi_wpa_s;\n+\n+\tndi_wpa_s = wpas_nan_get_ndi_iface(wpa_s, local_ndi);\n+\tif (!ndi_wpa_s) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: No NDI interface found for addr \" MACSTR,\n+\t\t\t MAC2STR(local_ndi));\n+\t\treturn;\n+\t}\n+\n+\tif (wpa_drv_sta_set_flags(ndi_wpa_s, peer_ndi, WPA_STA_AUTHORIZED,\n+\t\t\t\t 0, ~WPA_STA_AUTHORIZED))\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to clear authorize for NDI station\");\n+\n+\twpas_nan_remove_ndi_keys(ndi_wpa_s, peer_ndi);\n+\twpa_drv_sta_remove(ndi_wpa_s, peer_ndi);\n+}\n+\n+\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 \n+\tif (wpas_nan_add_ndi_sta(wpa_s, params->ndp_id.peer_nmi,\n+\t\t\t params->local_ndi, params->peer_ndi,\n+\t\t\t\t params->install_keys,\n+\t\t\t\t params->first_ndp) < 0) {\n+\t\twpa_printf(MSG_ERROR,\n+\t\t\t \"NAN: Failed to add NDI station for NDP connection\");\n+\t\treturn -1;\n+\t}\n+\n \tif (params->ssi) {\n \t\tssi_hex = os_zalloc(2 * params->ssi_len + 1);\n \t\tif (!ssi_hex)\n@@ -383,6 +583,7 @@ static void wpas_nan_ndp_disconnected_cb(void *ctx, struct nan_ndp_id *ndp_id,\n {\n \tstruct wpa_supplicant *wpa_s = ctx;\n \n+\twpas_nan_remove_ndi_sta(wpa_s, local_ndi, peer_ndi);\n \twpa_msg_global(wpa_s, MSG_INFO, NAN_NDP_DISCONNECTED\n \t\t \"peer=\" MACSTR \" ndp_id=%u local_ndi=\" MACSTR\n \t\t \" peer_ndi=\" MACSTR \" reason=%u\",\n", "prefixes": [ "48/71" ] }