Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2198448/?format=api
{ "id": 2198448, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2198448/?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": "<20260219202514.5781-44-andrei.otcheretianski@intel.com>", "date": "2026-02-19T20:24:59", "name": "[43/58] NAN: Handle security in NDP processing", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "da79829fcbc41a084232815c887d3adbb40eeb38", "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/20260219202514.5781-44-andrei.otcheretianski@intel.com/mbox/", "series": [ { "id": 492721, "url": "http://patchwork.ozlabs.org/api/1.0/series/492721/?format=api", "date": "2026-02-19T20:24:21", "name": "NAN: Add NAN Data Path (NDP) support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492721/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2198448/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=dFYT5fEo;\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=VrlK2isH;\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 4fH4kP3Htpz1xxN\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 20 Feb 2026 07:30:05 +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 1vtAeU-0000000C0uD-27BH;\n\tThu, 19 Feb 2026 20:29:34 +0000", "from mgamail.intel.com ([198.175.65.10])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1vtAdI-0000000Bwog-2BW2\n\tfor hostap@lists.infradead.org;\n\tThu, 19 Feb 2026 20:28:31 +0000", "from orviesa004.jf.intel.com ([10.64.159.144])\n by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:27:32 -0800", "from aotchere-mobl1.ger.corp.intel.com (HELO\n aotchere-mobl1.intel.com) ([10.245.246.171])\n by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 Feb 2026 12:27:29 -0800" ], "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=Iu6B2xU8keqZxv//aV7IyXwATIMxd3kNuZHb6HT6VLY=; b=dFYT5fEo2tGBhH\n\txdGHkKM5I3wKLFnyZLwdiNZDLwHIAXTvGv8WKm+q0X0epdPSOWrQpmj0OK/UmVK+Jar/Igls7cZoR\n\tjsyKuuOJVHPkfhQIYNJ4jTxYSKBVW1y5jP/d6fxn5YhOAPo7f0EkmrEDRtWrYG0OXRkM5sBROHJfu\n\tBE2vKHj8SR1OMeKpTFP/PGVZNC0hGvBXElwS2C1QYQMhtqb8E0VcQ24lJO7Q1y3wa9j2df20DOS40\n\t9pWPeIR5sugVl3Lngzcg+knZvJjzVrLcir/18MxdlGJSZmgK3IrhO00XTbFckotzJnuVJEw1C/Tbp\n\tuag+DnLBpR2qt5TtB+tA==;", "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1771532901; x=1803068901;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=v/a/X9Ar7ccJxNd3KovvVRomlpbSCtboxPsD2uTblao=;\n b=VrlK2isHkuO2sXFmEcKi30i6Wzf73UkVR1i5HuU6t37eyRmw8NA3nUZV\n +iaNBddpEp05KNStZR5P75hrmg5IvulCPURZqnaXYDvhc689CE1oGNFC+\n bQBkvu/C2GgyVPWOA+eebqA2qRHaGEwjBn3prDesGTogwNAl5u6aPFtBS\n opi2vm9ULeMWH+WGarRBdfENshQB5pS7iABzgRrkBxt15N2C1y3fQscVo\n Qt8E/qeZVqTLkHmLd8o1b7oP0zY5a5hCQRAQ+IWf8z/Yf0QhlBwCJcPw3\n IAvae4xWogNJlqrBhuqQ/0gJvHZpHsmi+K5uddo2dByFrEgTim4GEPbla\n w==;" ], "X-CSE-ConnectionGUID": [ "8YY79BesSK+ggjh5YXpw9A==", "uwMWf1ILTgOth1zNKL7k/w==" ], "X-CSE-MsgGUID": [ "xRjXGOXTQBe4Sm8JvN2K+A==", "nDEDzsNLSSGtx1b2gwCCAQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11706\"; a=\"90040130\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"90040130\"", "E=Sophos;i=\"6.21,300,1763452800\";\n d=\"scan'208\";a=\"219154025\"" ], "X-ExtLoop1": "1", "From": "Andrei Otcheretianski <andrei.otcheretianski@intel.com>", "To": "hostap@lists.infradead.org,\n\tvamsin@qti.qualcomm.com,\n\tvganneva@qti.qualcomm.com,\n\tmaheshkkv@google.com", "Cc": "Ilan Peer <ilan.peer@intel.com>", "Subject": "[PATCH 43/58] NAN: Handle security in NDP processing", "Date": "Thu, 19 Feb 2026 22:24:59 +0200", "Message-ID": "<20260219202514.5781-44-andrei.otcheretianski@intel.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260219202514.5781-1-andrei.otcheretianski@intel.com>", "References": "<20260219202514.5781-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-20260219_122820_776623_57A36C35 ", "X-CRM114-Status": "GOOD ( 17.29 )", "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 <ilan.peer@intel.com> - Handle security\n related\n attributes after NDP attribute processing is done. - Set the security\n present\n flag in the NDP control field when security is negotiated.\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.10 listed in list.dnswl.org]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\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_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n 0.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.10 listed in sa-accredit.habeas.com]\n 0.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.10 listed in\n sa-trusted.bondedsender.org]\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n 0.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.10 listed in\n bl.score.senderscore.com]\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": "<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\n- Handle security related attributes after NDP attribute processing\n is done.\n- Set the security present flag in the NDP control field\n when security is negotiated.\n\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/nan/nan_ndp.c | 135 +++++++++++++++++++++++++++++++++++++++-------\n 1 file changed, 117 insertions(+), 18 deletions(-)", "diff": "diff --git a/src/nan/nan_ndp.c b/src/nan/nan_ndp.c\nindex 6372b8d0a9..bd06309ce9 100644\n--- a/src/nan/nan_ndp.c\n+++ b/src/nan/nan_ndp.c\n@@ -133,6 +133,7 @@ int nan_ndp_setup_req(struct nan_data *nan, struct nan_peer *peer,\n \t\treturn ret;\n \t}\n \n+\tnan_sec_reset(nan, &peer->ndp_setup.sec);\n \tnan_ndp_set_state(nan, &peer->ndp_setup, NAN_NDP_STATE_START);\n \tpeer->ndp_setup.status = NAN_NDP_STATUS_CONTINUED;\n \treturn 0;\n@@ -209,6 +210,7 @@ static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n \tu16 exp_len = sizeof(struct ieee80211_ndp);\n \tu8 publish_inst_id;\n+\tint ret;\n \n \tif (ndp_setup->ndp) {\n \t\twpa_printf(MSG_DEBUG,\n@@ -248,6 +250,7 @@ static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \tif (!ndp_setup->ndp)\n \t\treturn -1;\n \n+\tnan_sec_reset(nan, &peer->ndp_setup.sec);\n \tnan_ndp_set_state(nan, ndp_setup, NAN_NDP_STATE_REQ_RECV);\n \n \tndp_setup->status = NAN_NDP_STATUS_CONTINUED;\n@@ -255,15 +258,16 @@ static int nan_ndp_attr_handle_req(struct nan_data *nan, struct nan_peer *peer,\n \t\t!!(ndp_attr->ndp_ctrl & NAN_NDP_CTRL_CONFIRM_REQUIRED);\n \tndp_setup->dialog_token = ndp_attr->dialog_token;\n \tndp_setup->publish_inst_id = publish_inst_id;\n+\tndp_setup->sec.present =\n+\t\t!!(ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT);\n \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-\t\tint ret;\n-\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: NDP: req: Handle NDP service specific information\");\n+\n \t\tret = nan_ndp_ssi(nan, &peer->ndp_setup,\n \t\t\t\t (u8 *)ndp_attr->optional + 1,\n \t\t\t\t ndp_len);\n@@ -282,6 +286,7 @@ static int nan_ndp_attr_handle_res(struct nan_data *nan, struct nan_peer *peer,\n {\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n \tu16 opt_len;\n+\tu8 sec_present;\n \n \tif (!ndp_setup->ndp) {\n \t\twpa_printf(MSG_DEBUG,\n@@ -355,10 +360,17 @@ static int nan_ndp_attr_handle_res(struct nan_data *nan, struct nan_peer *peer,\n \t\tgoto store_ssi;\n \t}\n \n-\tif (((ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT) ||\n-\t ndp_setup->conf_req) && status != NAN_NDP_STATUS_CONTINUED) {\n+\tsec_present = !!(ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT);\n+\tif (ndp_setup->sec.present != sec_present) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: Security present mismatch\");\n+\t\treturn -1;\n+\t}\n+\n+\tif ((sec_present || ndp_setup->conf_req) &&\n+\t status != NAN_NDP_STATUS_CONTINUED) {\n \t\twpa_printf(MSG_DEBUG,\n-\t\t\t \"NAN: NDP: Security present and status != continue\");\n+\t\t\t \"NAN: NDP: Security present or confirm required and status != continue\");\n \t\treturn -1;\n \t}\n \n@@ -407,6 +419,7 @@ static int nan_ndp_attr_handle_confirm(struct nan_data *nan,\n \t\t\t\t u8 status)\n {\n \tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n+\tu8 sec_present;\n \n \tif (!ndp_setup->ndp) {\n \t\twpa_printf(MSG_DEBUG,\n@@ -441,8 +454,14 @@ static int nan_ndp_attr_handle_confirm(struct nan_data *nan,\n \t\treturn -1;\n \t}\n \n-\tif ((ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT) &&\n-\t status != NAN_NDP_STATUS_CONTINUED) {\n+\tsec_present = !!(ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT);\n+\tif (ndp_setup->sec.present != sec_present) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: confirm security present mismatch\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (sec_present && status != NAN_NDP_STATUS_CONTINUED) {\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: NDP: confirm: status != continue with security\");\n \t\treturn -1;\n@@ -457,10 +476,9 @@ static int nan_ndp_attr_handle_confirm(struct nan_data *nan,\n \n \tndp_setup->status = status;\n \n-\t/* TODO: handle security */\n-\tif (status == NAN_NDP_STATUS_ACCEPTED)\n+\tif (sec_present)\n \t\tnan_ndp_set_state(nan, &peer->ndp_setup,\n-\t\t\t\t NAN_NDP_STATE_DONE);\n+\t\t\t\t NAN_NDP_STATE_CON_RECV);\n \telse\n \t\tnan_ndp_set_state(nan, &peer->ndp_setup,\n \t\t\t\t NAN_NDP_STATE_DONE);\n@@ -484,6 +502,62 @@ static struct nan_ndp * nan_ndp_find_ndp(struct nan_peer *peer,\n }\n \n \n+static int nan_ndp_attr_sec_install(struct nan_data *nan, struct nan_peer *peer,\n+\t\t\t\t struct ieee80211_ndp *ndp_attr, u8 status)\n+{\n+\tstruct nan_ndp_setup *ndp_setup = &peer->ndp_setup;\n+\tu8 sec_present;\n+\n+\tif (!ndp_setup->ndp) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install while no NDP WIP with peer\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (ndp_setup->state != NAN_NDP_STATE_CON_SENT) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install while not expecting one\");\n+\n+\t\tif (ndp_setup->state != NAN_NDP_STATE_RES_RECV ||\n+\t\t ndp_setup->status != NAN_NDP_STATUS_CONTINUED)\n+\t\t\treturn -1;\n+\n+\t\t/* Due to races with the driver, it is possible that the\n+\t\t * install is received before an ACK is indicated. Allow the\n+\t\t * processing of the attribute, and if all parameters are OK,\n+\t\t * fast forward the state machine below.\n+\t\t */\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install received before Tx status.\");\n+\t}\n+\n+\tif (ndp_setup->ndp->ndp_id != ndp_attr->ndp_id ||\n+\t ndp_setup->dialog_token != ndp_attr->dialog_token ||\n+\t os_memcmp(ndp_setup->ndp->init_ndi, ndp_attr->initiator_ndi,\n+\t\t ETH_ALEN)) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install: invalid NDP parameters\");\n+\t\treturn -1;\n+\t}\n+\n+\tsec_present = !!(ndp_attr->ndp_ctrl & NAN_NDP_CTRL_SECURITY_PRESENT);\n+\tif (ndp_setup->sec.present != sec_present) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install: security present mismatch\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (status != NAN_NDP_STATUS_ACCEPTED) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: NDP: sec install: status != ACCEPTED\");\n+\t\treturn -1;\n+\t}\n+\n+\tnan_ndp_set_state(nan, &peer->ndp_setup, NAN_NDP_STATE_DONE);\n+\treturn 0;\n+}\n+\n+\n static int nan_ndp_attr_handle_term(struct nan_data *nan, struct nan_peer *peer,\n \t\t\t\t struct ieee80211_ndp *ndp_attr, u8 status)\n {\n@@ -570,6 +644,7 @@ int nan_ndp_handle_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n {\n \tstruct ieee80211_ndp *ndp_attr;\n \tu8 type, status;\n+\tint ret;\n \n \tif (!msg || !peer || !msg->attrs.ndp)\n \t\treturn -1;\n@@ -596,22 +671,43 @@ int nan_ndp_handle_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \n \tswitch (type) {\n \tcase NAN_NDP_TYPE_REQUEST:\n-\t\treturn nan_ndp_attr_handle_req(nan, peer, ndp_attr,\n-\t\t\t\t\t msg->attrs.ndp_len, status);\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\tbreak;\n \tcase NAN_NDP_TYPE_RESPONSE:\n-\t\treturn 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\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\tbreak;\n \tcase NAN_NDP_TYPE_CONFIRM:\n-\t\treturn nan_ndp_attr_handle_confirm(nan, peer, ndp_attr, status);\n+\t\tret = nan_ndp_attr_handle_confirm(nan, peer, ndp_attr, status);\n+\t\tbreak;\n \tcase NAN_NDP_TYPE_SECURITY_INSTALL:\n-\t\t/* TODO: Handle security */\n-\t\treturn -1;\n+\t\tret = nan_ndp_attr_sec_install(nan, peer, ndp_attr, status);\n+\t\tbreak;\n \tcase NAN_NDP_TYPE_TERMINATE:\n \t\treturn nan_ndp_attr_handle_term(nan, peer, ndp_attr, status);\n \tdefault:\n \t\treturn -1;\n \t}\n+\n+\t/* error or no security ... we are done */\n+\tif (ret || !peer->ndp_setup.sec.present ||\n+\t peer->ndp_setup.status == NAN_NDP_STATUS_REJECTED)\n+\t\treturn ret;\n+\n+\tret = nan_sec_rx(nan, peer, msg);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* processing of confirm is successful, so to the overall status is\n+\t * success\n+\t */\n+\tif (type == NAN_NDP_TYPE_CONFIRM)\n+\t\tpeer->ndp_setup.status = NAN_NDP_STATUS_ACCEPTED;\n+\n+\treturn 0;\n }\n \n \n@@ -672,6 +768,9 @@ int nan_ndp_add_ndp_attr(struct nan_data *nan, struct nan_peer *peer,\n \t\treturn 0;\n \t}\n \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 \tlen_ptr = wpabuf_put(buf, 2);\n \n", "prefixes": [ "43/58" ] }