{"id":2218840,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218840/?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-50-andrei.otcheretianski@intel.com>","date":"2026-04-01T22:01:58","name":"[49/71] nl80211: Report NAN scheduling capabilities","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a69958220fc8b7f83fd8beddf8fbc599d71b9f19","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-50-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/2218840/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=WE0shpMk;\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=DL8ZkOON;\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 4fmK093zm4z1yFv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 09:09:29 +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 1w83k0-0000000GEJL-1zmu;\n\tWed, 01 Apr 2026 22:08:48 +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 1w83hX-0000000G9is-0IkG\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:27 +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:03 -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:03 -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=rP5jy7UdpJfoq9NDrdqINt7XViuXdVnj01ba6DTw+wg=; b=WE0shpMk5Toi8p\n\t9erurW4LKuChMDmXMUbiXr4uleEYdVkLbwVeajZDwt/dxgq9LJKSPoPfBcz2JiiVvd/I3PEG/2hjJ\n\tzcMuAp0B5C8c05JiTLelqoS4Bzwy7zrMill6WVzt1YoWGUOraJZiLpAiEWu+qn80RUsZa3jp0jVFq\n\tsJt5fW1geA81yqEu8cVWr7HR0aa3fQYKbrbWhDzDezcBGbMyV/c0EaEZ1OHugLU6KigBTwV2sB3G5\n\tuftHBh1vYcGl9GV5FS51B9ENZbJoIpLRJZnxSDr/bld/GHUCqkcLfMLs53bTlLbhqrQidaKEDtuqv\n\ttOwYUtgyWvbPKId/nB/g==;","v=1; a=rsa-sha256; c=relaxed/simple;\n  d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n  t=1775081175; x=1806617175;\n  h=from:to:subject:date:message-id:in-reply-to:references:\n   mime-version:content-transfer-encoding;\n  bh=kLzoelwKRY+VNk0RTuuGSMy+n8vFOI5580G0EJJGVfE=;\n  b=DL8ZkOON6mRCB62Vb/+e8BjG14P7sDj901uFeMp7WyTx1KnQbBTRnYx6\n   XWx6HNqhTdW8fFCy2sx0ajnV4pOUiXOJOzu1Io3Skg2F1BXGKpWdLueAl\n   fEkHK41VRtyOeK7jlxGAJjV26xDht/WzeNIrt+QAeyFPUoJm+hcXgW0km\n   ipomwsQstsEgmAsUlyElTmoPJrMKs94y71CO3pPeJgscK52313Ujd9zUW\n   +WjnHSyfvRlzgXsChZcO4Le2gOsJ41vyt2Js7VxHb2vCkXFOEBty6AtN3\n   pznGxeKI3BGa1MH1FXcgy3iK4SYBTJW5qQ0nSpvPZS01KOkSZcCVbwnrW\n   w==;"],"X-CSE-ConnectionGUID":["jtWAYM71Qd6YtdU7MsXx7Q==","zc8AOzs+Qf6bV8G3i9gQAA=="],"X-CSE-MsgGUID":["8rOd5uznSEKzXG8jKwfp8w==","/yQPx5X2RMqmV45g7nV8xA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11746\"; a=\"75851644\"","E=Sophos;i=\"6.23,153,1770624000\";\n   d=\"scan'208\";a=\"75851644\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski <andrei.otcheretianski@intel.com>","To":"hostap@lists.infradead.org","Subject":"[PATCH 49/71] nl80211: Report NAN scheduling capabilities","Date":"Thu,  2 Apr 2026 01:01:58 +0300","Message-ID":"<20260401220220.4418-50-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_150615_197670_5956DEA1 ","X-CRM114-Status":"GOOD (  16.28  )","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:  If the kernel indicates support for NAN set the scheduling\n    capabilities as follows: - Set the slot time to 16 TUs and the schedule\n period\n    to 512 TUs as this is the only configuration supported by the kernel. -\n Set\n    the number of supported radios to 1 (as currently the kernel API doesn\n [...]    \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":"<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":"If the kernel indicates support for NAN set the scheduling\ncapabilities as follows:\n\n- Set the slot time to 16 TUs and the schedule period to 512 TUs\n  as this is the only configuration supported by the kernel.\n- Set the number of supported radios to 1 (as currently the kernel\n  API doesn't have support for indicating combinations of multiple\n  radios.\n- Set the number of NAN schedule channels based on the number of\n  supported concurrent channels in interface combinations that\n  include NAN.\n- If the kernel indicates support for NAN Data interface, indicate\n  so in the NAN capability flags.\n- Parse NAN data path capabilities reported by the kernel.\n\nSigned-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>\nSigned-off-by: Ilan Peer <ilan.peer@intel.com>\n---\n src/drivers/driver_nl80211_capa.c | 59 ++++++++++++++++++++++++++++---\n 1 file changed, 55 insertions(+), 4 deletions(-)","diff":"diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c\nindex 637ccc7c74..bd673f60f0 100644\n--- a/src/drivers/driver_nl80211_capa.c\n+++ b/src/drivers/driver_nl80211_capa.c\n@@ -62,6 +62,7 @@ struct wiphy_info_data {\n \tstruct wpa_driver_capa *capa;\n \n \tunsigned int num_multichan_concurrent;\n+\tunsigned int num_multichan_concurrent_nan;\n \n \tunsigned int error:1;\n \tunsigned int device_ap_sme:1;\n@@ -83,6 +84,9 @@ struct wiphy_info_data {\n \tunsigned int has_key_mgmt:1;\n \tunsigned int has_key_mgmt_iftype:1;\n \tunsigned int support_ap_scan:1;\n+\n+\tunsigned int nan_supported:1;\n+\tunsigned int nan_ndp_supported:1;\n };\n \n \n@@ -161,6 +165,8 @@ static int wiphy_info_iface_comb_process(struct wiphy_info_data *info,\n \t\t[NL80211_IFACE_LIMIT_TYPES] = { .type = NLA_NESTED },\n \t\t[NL80211_IFACE_LIMIT_MAX] = { .type = NLA_U32 },\n \t};\n+\tbool combination_has_nan = false, combination_has_nan_ndp = false;\n+\tunsigned int num_channels;\n \n \terr = nla_parse_nested(tb_comb, MAX_NL80211_IFACE_COMB,\n \t\t\t       nl_combi, iface_combination_policy);\n@@ -188,20 +194,29 @@ static int wiphy_info_iface_comb_process(struct wiphy_info_data *info,\n \t\t\t\tcombination_has_p2p = 1;\n \t\t\tif (ift == NL80211_IFTYPE_STATION)\n \t\t\t\tcombination_has_mgd = 1;\n+\t\t\tif (ift == NL80211_IFTYPE_NAN)\n+\t\t\t\tcombination_has_nan = true;\n+\t\t\tif (ift == NL80211_IFTYPE_NAN_DATA)\n+\t\t\t\tcombination_has_nan_ndp = true;\n \t\t}\n-\t\tif (combination_has_p2p && combination_has_mgd)\n-\t\t\tbreak;\n \t}\n \n+\tnum_channels = nla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]);\n \tif (combination_has_p2p && combination_has_mgd) {\n-\t\tunsigned int num_channels =\n-\t\t\tnla_get_u32(tb_comb[NL80211_IFACE_COMB_NUM_CHANNELS]);\n \n \t\tinfo->p2p_concurrent = 1;\n \t\tif (info->num_multichan_concurrent < num_channels)\n \t\t\tinfo->num_multichan_concurrent = num_channels;\n \t}\n \n+\tif (combination_has_nan) {\n+\t\tinfo->nan_supported = 1;\n+\t\tinfo->nan_ndp_supported = combination_has_nan_ndp;\n+\n+\t\tif (info->num_multichan_concurrent_nan < num_channels)\n+\t\t\tinfo->num_multichan_concurrent_nan = num_channels;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -1256,6 +1271,22 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)\n \t\t\tcapa->nan_capa.drv_flags |=\n \t\t\t\tWPA_DRIVER_FLAGS_NAN_SUPPORT_USERSPACE_DE;\n \t\t}\n+\n+\t\tif (tb_nan_capa[NL80211_NAN_CAPA_MAX_CHANNEL_SWITCH_TIME])\n+\t\t\tcapa->nan_capa.max_channel_switch_time =\n+\t\t\t\tnla_get_u16(tb_nan_capa[NL80211_NAN_CAPA_MAX_CHANNEL_SWITCH_TIME]);\n+\n+\t\tif (tb_nan_capa[NL80211_NAN_CAPA_NUM_ANTENNAS])\n+\t\t\tcapa->nan_capa.num_antennas =\n+\t\t\t\tnla_get_u8(tb_nan_capa[NL80211_NAN_CAPA_NUM_ANTENNAS]);\n+\n+\t\tif (tb_nan_capa[NL80211_NAN_CAPA_OP_MODE])\n+\t\t\tcapa->nan_capa.op_modes =\n+\t\t\t\tnla_get_u8(tb_nan_capa[NL80211_NAN_CAPA_OP_MODE]);\n+\n+\t\tif (tb_nan_capa[NL80211_NAN_CAPA_CAPABILITIES])\n+\t\t\tcapa->nan_capa.dev_capa =\n+\t\t\t\tnla_get_u8(tb_nan_capa[NL80211_NAN_CAPA_CAPABILITIES]);\n \t}\n #endif /* CONFIG_NAN */\n \n@@ -1344,6 +1375,26 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,\n \tif (!drv->capa.max_num_akms)\n \t\tdrv->capa.max_num_akms = NL80211_MAX_NR_AKM_SUITES;\n \n+#ifdef CONFIG_NAN\n+\tif (info->nan_supported) {\n+\t\twpa_printf(MSG_DEBUG, \"nl80211: NAN supported\");\n+\n+\t\tif (info->nan_ndp_supported)\n+\t\t\tdrv->capa.nan_capa.drv_flags |= WPA_DRIVER_FLAGS_NAN_SUPPORT_NDP;\n+\n+\t\t/* TODO: Currently support only a single radio */\n+\t\tdrv->capa.nan_capa.num_radios = 1;\n+\t\tdrv->capa.nan_capa.sched_chans = info->num_multichan_concurrent_nan;\n+\n+\t\t/*\n+\t\t * nl80211 supports only a single configuration that uses 16 TU\n+\t\t * slots and a period of 512 TUs\n+\t\t */\n+\t\tdrv->capa.nan_capa.slot_duration = 16;\n+\t\tdrv->capa.nan_capa.schedule_period = 512;\n+\t}\n+#endif /* CONFIG_NAN */\n+\n \treturn 0;\n }\n \n","prefixes":["49/71"]}