Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2229821/?format=api
{ "id": 2229821, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2229821/?format=api", "web_url": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-18-andrei.otcheretianski@intel.com/", "project": { "id": 22, "url": "http://patchwork.ozlabs.org/api/1.1/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": "<20260428200639.40243-18-andrei.otcheretianski@intel.com>", "date": "2026-04-28T20:05:18", "name": "[17/97] NAN: Add support for NDPE", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c89a539401bacc374ee9a718f2306b71e521e888", "submitter": { "id": 62065, "url": "http://patchwork.ozlabs.org/api/1.1/people/62065/?format=api", "name": "Andrei Otcheretianski", "email": "andrei.otcheretianski@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-18-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 501927, "url": "http://patchwork.ozlabs.org/api/1.1/series/501927/?format=api", "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/2229821/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2229821/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=AiM0Gd8q;\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=F0LbNpro;\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 4g4s2n5YN2z1yHv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 29 Apr 2026 06:09:05 +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 1wHojS-00000002Din-1B4h;\n\tTue, 28 Apr 2026 20:08:34 +0000", "from mgamail.intel.com ([198.175.65.16])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHoib-00000002Cfh-34Tl\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:07:43 +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:07:41 -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:07:39 -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=pF2mbSmkQaHUPuUA85sTDSzzk/Zo2FZJNCPITKzxnCE=; b=AiM0Gd8qASeIzp\n\t/Gvs5Wi0+rVDT7VMM4e0WeOLj5qx2j0AmNzEhPPbOAy7dW/dBx7Y1SGR/N/ddUvtdPHtv1vTBrLtM\n\t349xBGvUHsil9E4C+Aic2VlR+ev07QewwXTp3CKp7EvcApumbsJABUyrp7+1htmhx9wuGj2vRIFXz\n\tOOorWqgi9a+a5ExBW+pFGQqbIZk82zbmLGxFcS/h1K+djaY00PBCUSx135qT3TX4imqLAIHIwqMTx\n\toydlfPng9q25Ul6s08zx7J9NTgfXjCGdla5dbtcY24uRx8xN0BZj3xNjQ24LBAEy1eSrxKStjJ8TE\n\tiR1xaCrMnPhmZNQqXkag==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406862; x=1808942862;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=j8qcEIM6fZ5auFLFLG1IxhkRUm3nBRT3FJ3PtzRcyK0=;\n b=F0LbNproNxJuOX3wSwK8v4kLmNK07S4LASyljUeptlAdSnY32livLOLf\n khsVgUsCEzgaQxGWrzBTKhWRD45gQUGOsmsTxxtV8v0nQzMU2/kmi9cJG\n koKphci6HsNXl1n9ZI3/WaK09TvXy1XzCQSYyYc2x5JYMB5TIH5I9z7Fl\n Q47hybiiG7i5ESwY6inf7a4gyDDrIpctHZqWRgp+1ii/wkXc3H5xm1Yzz\n FHOKfea2Oqx0xwZDYd3RP0l8/G0tM3UzEAhDUJTYEJGgSQBRJbE4ZbLgC\n CbFVUbfB87Hga8kARVVAlAWrBQPLOezg9lMk1HEnKyC2WHU82d7vBbD0h\n w==;" ], "X-CSE-ConnectionGUID": [ "8kOD/pQRS1SPB+avrqJ20Q==", "u7wk7zJsQ4SdPF/7M61D6Q==" ], "X-CSE-MsgGUID": [ "MlUrHQSrRBWh/srgQGulOg==", "xB3TAGV4TCSCbwMXtQxh8w==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11770\"; a=\"78519321\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519321\"", "E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610038\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org", "Cc": "vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tIlan Peer <ilan.peer@intel.com>", "Subject": "[PATCH 17/97] NAN: Add support for NDPE", "Date": "Tue, 28 Apr 2026 23:05:18 +0300", "Message-ID": "<20260428200639.40243-18-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_130741_893203_D1D1C5EC ", "X-CRM114-Status": "GOOD ( 22.47 )", "X-Spam-Score": "-4.5 (----)", "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 <ilan.peer@intel.com> Add support for\n adding\n NAN Data Path Extension (NDPE) attribute and processing it. When both the\n local device and the peer device support NDPE processing use NDPE\n attributes\n in NDP setup. Otherwise, u [...]\n Content analysis details: (-4.5 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_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 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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.1 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": "From: Ilan Peer <ilan.peer@intel.com>\n\nAdd support for adding NAN Data Path Extension (NDPE)\nattribute and processing it. When both the local device\nand the peer device support NDPE processing use NDPE attributes\nin NDP setup. Otherwise, use NDP attributes.\n\nAs the NDP attribute and the NDPE attribute are very similar\nuse common flows where possible.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/nan/nan.c | 26 ++++++++\n src/nan/nan_i.h | 1 +\n src/nan/nan_ndp.c | 159 ++++++++++++++++++++++++++++++++++++++++------\n 3 files changed, 168 insertions(+), 18 deletions(-)", "diff": "diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex 3410313610..a91fb8c713 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -2796,3 +2796,29 @@ int nan_set_bootstrap_configuration(struct nan_data *nan,\n \n \treturn 0;\n }\n+\n+\n+/**\n+ * nan_is_ndpe_supported - Check if NDPE attribute is supported with peer\n+ * @nan: NAN module context from nan_init()\n+ * @peer: NAN peer\n+ * Return true if the peer supports NDPE attribute; false otherwise.\n+ */\n+bool nan_is_ndpe_supported(struct nan_data *nan, struct nan_peer *peer)\n+{\n+\tstruct nan_dev_capa_entry *cur;\n+\n+\tif (!nan || !peer)\n+\t\treturn false;\n+\n+\tdl_list_for_each(cur, &peer->info.dev_capa,\n+\t\t\t struct nan_dev_capa_entry, list) {\n+\t\t/*\n+\t\t * Take the first one, as NDPE support should be identical\n+\t\t * across all attributes\n+\t\t */\n+\t\treturn !!(cur->capa.capa & NAN_DEV_CAPA_NDPE_ATTR_SUPP);\n+\t}\n+\n+\treturn false;\n+}\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex 8adae9476d..3bd01debc0 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -782,6 +782,7 @@ void nan_parse_peer_dev_capa_ext(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t struct nan_attrs *attrs);\n int nan_configure_peer_schedule(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\tconst struct nan_schedule *local_sched);\n+bool nan_is_ndpe_supported(struct nan_data *nan, struct nan_peer *peer);\n #ifdef CONFIG_PASN\n int nan_nira_get_tag_nonce(const struct nan_config *nan, u8 *nonce, u8 *tag);\n void nan_pairing_deinit_peer(struct nan_peer *peer);\ndiff --git a/src/nan/nan_ndp.c b/src/nan/nan_ndp.c\nindex 4ff1accd33..91e517115a 100644\n--- a/src/nan/nan_ndp.c\n+++ b/src/nan/nan_ndp.c\n@@ -244,9 +244,65 @@ int nan_ndp_setup_resp(struct nan_data *nan, struct nan_peer *peer,\n }\n \n \n+static int nan_ndp_attr_handle_tlvs(struct nan_data *nan,\n+\t\t\t\t struct nan_peer *peer,\n+\t\t\t\t const u8 *tlvs, u16 tlvs_len)\n+{\n+\twpa_printf(MSG_DEBUG, \"NAN: NDP: Handle NDPE TLVs len=%u\", tlvs_len);\n+\n+\twhile (tlvs_len > 3) {\n+\t\tu8 tlv_type = tlvs[0];\n+\t\tu16 tlv_len = WPA_GET_LE16(tlvs + 1);\n+\t\tconst u8 *tlv_data = tlvs + 3;\n+\t\tint ret;\n+\n+\t\tif (tlv_len + 3 > tlvs_len) {\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: NDP: Invalid TLV len=%u for type=%u\",\n+\t\t\t\t tlv_len, tlv_type);\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\tswitch (tlv_type) {\n+\t\tcase NAN_NDPE_TLV_SRV_INFO:\n+\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t \"NAN: NDP: Handle NDP service specific information\");\n+\n+\t\t\tif (tlv_len >= 4 && WPA_GET_BE24(tlv_data) == OUI_WFA &&\n+\t\t\t tlv_data[3] == NAN_SRV_PROTO_GENERIC)\n+\t\t\t\tret = nan_ndp_ssi(nan, &peer->ndp_setup,\n+\t\t\t\t\t\t tlv_data + 4, tlv_len - 4);\n+\t\t\telse\n+\t\t\t\tret = nan_ndp_ssi(nan, &peer->ndp_setup,\n+\t\t\t\t\t\t tlv_data, tlv_len);\n+\t\t\tif (ret)\n+\t\t\t\twpa_printf(MSG_DEBUG,\n+\t\t\t\t\t \"NAN: NDP: Failed to save ssi. continue\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\twpa_printf(MSG_DEBUG, \"NAN: NDP: unknown TLV type=%u\",\n+\t\t\t\t tlv_type);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\ttlvs += 3 + tlv_len;\n+\t\ttlvs_len -= 3 + tlv_len;\n+\t}\n+\n+\tif (tlvs_len) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: TLV parsing ended with %u left octets\",\n+\t\t\t tlvs_len);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\n static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t struct ieee80211_ndp *ndp_attr, u16 ndp_len,\n-\t\t\t\t u8 status)\n+\t\t\t\t u8 status, bool ndpe)\n {\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n \tu16 exp_len = sizeof(struct ieee80211_ndp);\n@@ -304,7 +360,8 @@ static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \t/* Handle service specific information */\n \tndp_len -= exp_len;\n \n-\tif (ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SPEC_INFO_PRESENT && ndp_len) {\n+\tif (!ndpe && ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SPEC_INFO_PRESENT &&\n+\t ndp_len) {\n \t\tint ret;\n \n \t\twpa_printf(MSG_DEBUG,\n@@ -316,15 +373,20 @@ static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \t\tif (ret)\n \t\t\twpa_printf(MSG_DEBUG,\n \t\t\t\t \"NAN: NDP: req: Failed to save ssi. continue\");\n+\t\treturn ret;\n \t}\n \n+\tif (ndpe)\n+\t\treturn nan_ndp_attr_handle_tlvs(nan, peer,\n+\t\t\t\t\t\tndp_attr->optional + 1, ndp_len);\n+\n \treturn 0;\n }\n \n \n static int nan_ndp_attr_handle_res(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t struct ieee80211_ndp *ndp_attr, u16 ndp_len,\n-\t\t\t\t u8 status)\n+\t\t\t\t u8 status, bool ndpe)\n {\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n \tu16 opt_len;\n@@ -437,7 +499,8 @@ static int nan_ndp_attr_handle_res(struct nan_data *nan, struct nan_peer *peer,\n store_ssi:\n \t/* Handle service specific information */\n \tndp_len -= sizeof(struct ieee80211_ndp) + opt_len;\n-\tif (ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SPEC_INFO_PRESENT && ndp_len) {\n+\tif (!ndpe && ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SPEC_INFO_PRESENT &&\n+\t ndp_len) {\n \t\tint ret;\n \n \t\twpa_printf(MSG_DEBUG, \"NAN: NDP: resp: Handle NDP ssi\");\n@@ -446,8 +509,14 @@ store_ssi:\n \t\tif (ret)\n \t\t\twpa_printf(MSG_DEBUG,\n \t\t\t\t \"NAN: NDP: resp: Failed to save ssi. continue\");\n+\t\treturn ret;\n \t}\n \n+\tif (ndpe)\n+\t\treturn nan_ndp_attr_handle_tlvs(nan, peer,\n+\t\t\t\t\t\tndp_attr->optional + opt_len,\n+\t\t\t\t\t\tndp_len);\n+\n \treturn 0;\n }\n \n@@ -681,14 +750,35 @@ static int nan_ndp_attr_handle_term(struct nan_data *nan, struct nan_peer *peer,\n int nan_ndp_handle_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t struct nan_msg *msg)\n {\n-\tstruct ieee80211_ndp *ndp_attr;\n+\tstruct ieee80211_ndp *ndp_attr = NULL;\n+\tsize_t ndp_attr_len = 0;\n+\tbool ndpe_supported;\n \tu8 type, status;\n \tint ret;\n \n-\tif (!msg || !peer || !msg->attrs.ndp)\n+\tif (!msg || !peer || (!msg->attrs.ndp && !msg->attrs.ndpe))\n \t\treturn -1;\n \n-\tndp_attr = (struct ieee80211_ndp *) msg->attrs.ndp;\n+\tndpe_supported = nan_is_ndpe_supported(nan, peer);\n+\twpa_printf(MSG_DEBUG,\n+\t\t \"NAN: NDP: Handle NDP attribute. ndpe_supported=%u\",\n+\t\t ndpe_supported);\n+\n+\t/*\n+\t * The NDP attribute and the NDPE attribute are very similar in\n+\t * structure so handle them in the same way where possible\n+\t */\n+\tif (ndpe_supported) {\n+\t\tndp_attr = (struct ieee80211_ndp *) msg->attrs.ndpe;\n+\t\tndp_attr_len = msg->attrs.ndpe_len;\n+\t}\n+\n+\tif (!ndp_attr || !ndp_attr_len) {\n+\t\tndp_attr = (struct ieee80211_ndp *) msg->attrs.ndp;\n+\t\tndp_attr_len = msg->attrs.ndp_len;\n+\t\tndpe_supported = false;\n+\t}\n+\n \ttype = BITS(ndp_attr->type_and_status, NAN_NDP_TYPE_MASK,\n \t\t NAN_NDP_TYPE_POS);\n \tstatus = BITS(ndp_attr->type_and_status, NAN_NDP_STATUS_MASK,\n@@ -710,13 +800,13 @@ int nan_ndp_handle_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \tswitch (type) {\n \tcase NAN_NDP_TYPE_REQUEST:\n \t\tret = nan_ndp_attr_handle_req(nan, peer, ndp_attr,\n-\t\t\t\t\t msg->attrs.ndp_len,\n-\t\t\t\t\t status);\n+\t\t\t\t\t ndp_attr_len, status,\n+\t\t\t\t\t ndpe_supported);\n \t\tbreak;\n \tcase NAN_NDP_TYPE_RESPONSE:\n \t\tret = nan_ndp_attr_handle_res(nan, peer, ndp_attr,\n-\t\t\t\t\t msg->attrs.ndp_len,\n-\t\t\t\t\t status);\n+\t\t\t\t\t ndp_attr_len, status,\n+\t\t\t\t\t ndpe_supported);\n \t\tbreak;\n \tcase NAN_NDP_TYPE_CONFIRM:\n \t\tret = nan_ndp_attr_handle_confirm(nan, peer, ndp_attr, status);\n@@ -761,10 +851,13 @@ int nan_ndp_add_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \tstruct nan_ndp_setup *ndp_setup;\n \tu8 type, ndp_ctrl = 0;\n \tu8 *len_ptr;\n+\tbool ndpe_supported;\n+\tbool add_srv_info = false;\n \n \tif (!peer || !peer->ndp_setup.ndp)\n \t\treturn -1;\n \n+\tndpe_supported = nan_is_ndpe_supported(nan, peer);\n \tndp_setup = &peer->ndp_setup;\n \n \tswitch (ndp_setup->state) {\n@@ -773,15 +866,21 @@ int nan_ndp_add_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \t\tndp_ctrl = NAN_NDP_CTRL_PUBLISH_ID_PRESENT;\n \t\tif (ndp_setup->conf_req)\n \t\t\tndp_ctrl |= NAN_NDP_CTRL_CONFIRM_REQUIRED;\n-\t\tif (ndp_setup->ssi && ndp_setup->ssi_len)\n-\t\t\tndp_ctrl |= NAN_NDP_CTRL_SPEC_INFO_PRESENT;\n+\t\tif (ndp_setup->ssi && ndp_setup->ssi_len) {\n+\t\t\tadd_srv_info = true;\n+\t\t\tif (!ndpe_supported)\n+\t\t\t\tndp_ctrl |= NAN_NDP_CTRL_SPEC_INFO_PRESENT;\n+\t\t}\n \t\tbreak;\n \tcase NAN_NDP_STATE_REQ_RECV:\n \t\ttype = NAN_NDP_TYPE_RESPONSE;\n \t\tif (ndp_setup->status != NAN_NDP_STATUS_REJECTED)\n \t\t\tndp_ctrl |= NAN_NDP_CTRL_RESPONDER_NDI_PRESENT;\n-\t\tif (ndp_setup->ssi && ndp_setup->ssi_len)\n-\t\t\tndp_ctrl |= NAN_NDP_CTRL_SPEC_INFO_PRESENT;\n+\t\tif (ndp_setup->ssi && ndp_setup->ssi_len) {\n+\t\t\tadd_srv_info = true;\n+\t\t\tif (!ndpe_supported)\n+\t\t\t\tndp_ctrl |= NAN_NDP_CTRL_SPEC_INFO_PRESENT;\n+\t\t}\n \t\tbreak;\n \tcase NAN_NDP_STATE_RES_RECV:\n \t\ttype = NAN_NDP_TYPE_CONFIRM;\n@@ -807,7 +906,15 @@ int nan_ndp_add_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \tif (ndp_setup->sec.present)\n \t\tndp_ctrl |= NAN_NDP_CTRL_SECURITY_PRESENT;\n \n-\twpabuf_put_u8(buf, NAN_ATTR_NDP);\n+\t/*\n+\t * The NDP attribute and the NDPE attribute are very similar in\n+\t * structure so handle them in the same way where possible\n+\t */\n+\tif (ndpe_supported)\n+\t\twpabuf_put_u8(buf, NAN_ATTR_NDP_EXT);\n+\telse\n+\t\twpabuf_put_u8(buf, NAN_ATTR_NDP);\n+\n \tlen_ptr = wpabuf_put(buf, 2);\n \n \twpabuf_put_u8(buf, ndp_setup->dialog_token);\n@@ -824,8 +931,24 @@ int nan_ndp_add_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \tif (ndp_ctrl & NAN_NDP_CTRL_RESPONDER_NDI_PRESENT)\n \t\twpabuf_put_data(buf, ndp_setup->ndp->resp_ndi, ETH_ALEN);\n \n-\tif (ndp_ctrl & NAN_NDP_CTRL_SPEC_INFO_PRESENT)\n-\t\twpabuf_put_data(buf, ndp_setup->ssi, ndp_setup->ssi_len);\n+\tif (add_srv_info) {\n+\t\tif (!ndpe_supported) {\n+\t\t\twpabuf_put_data(buf, ndp_setup->ssi,\n+\t\t\t\t\tndp_setup->ssi_len);\n+\t\t} else {\n+\t\t\t/*\n+\t\t\t * TODO: For the service specific info use the WFA\n+\t\t\t * format. If there is a need to support other vendor\n+\t\t\t * OUIs, this would need to be extended.\n+\t\t\t */\n+\t\t\twpabuf_put_u8(buf, NAN_NDPE_TLV_SRV_INFO);\n+\t\t\twpabuf_put_le16(buf, 4 + ndp_setup->ssi_len);\n+\t\t\twpabuf_put_be24(buf, OUI_WFA);\n+\t\t\twpabuf_put_u8(buf, NAN_SRV_PROTO_GENERIC);\n+\t\t\twpabuf_put_data(buf, ndp_setup->ssi,\n+\t\t\t\t\tndp_setup->ssi_len);\n+\t\t}\n+\t}\n \n \tWPA_PUT_LE16(len_ptr, (u8 *) wpabuf_put(buf, 0) - len_ptr - 2);\n \treturn 0;\n", "prefixes": [ "17/97" ] }