{"id":2218846,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2218846/?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-56-andrei.otcheretianski@intel.com>","date":"2026-04-01T22:02:04","name":"[55/71] wpa_supplicant: Set availability attribute in NAN schedule config","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ab70dae1473efbf8f3ba0ea112506a42a0fba077","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-56-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/2218846/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=lAXtWR62;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=desiato.20200630 header.b=YuKTO6RU;\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=cPPrxFyh;\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 4fmK0v59Zgz1yCs\n\tfor ; Thu, 02 Apr 2026 09:10:07 +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 1w83kg-0000000GF8f-1ZDP;\n\tWed, 01 Apr 2026 22:09:30 +0000","from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hx-0000000GBWT-24pp\n\tfor hostap@bombadil.infradead.org;\n\tWed, 01 Apr 2026 22:06:41 +0000","from mgamail.intel.com ([198.175.65.20])\n\tby desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w83hr-00000001M2U-4A9h\n\tfor hostap@lists.infradead.org;\n\tWed, 01 Apr 2026 22:06:39 +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:09 -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:08 -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=GCmFYG8BGR/pstBJyGl7MAOxaBjB/MPV3uZSUcU7HnA=; b=lAXtWR624p6XII\n\tf8E6NBFpBSF3tFsMxvAfK91WRApRs/ydwt9FnvfUjW+gy9dEDJBsONg+ghdT672Qf6etKxFDXc40Q\n\tVrf/ypppuwFRyxD9oE+1JUC+hdkiQPTk+MyJPGCVxt9rpK+ORixduLqQNnBK0kCHCFwfLjWYt0bag\n\tnucS+Y0N5lIdsZXrrPg6/TGG5XEBAixNAGm2LuOZRTeyyIqgPE3sX1PfRxRYWZpoSFlo5LUKEIYAO\n\tS2aubTYeAieiotwv9xfx/h8OkBj4bGX9PxA72D2bx+tSX/K8f8lAZBxjk/9WcNRNIm8k1wBTQj7Vi\n\twprdQWiXYpPZee+q2mqA==;","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version\n\t:References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=9sDuDpCj3yZ6kYpahF88A79kXdv81KBps9cHcAOIEvw=; b=YuKTO6RUX8eSA/h9ZeS1EtyDpu\n\tF30J64+rQowqh50ljIAcX8xpNGa0b30d3jWXE0QBoOfkGpgZ2wjjthxuYKw2pCqBgrrSENNoSezSr\n\tHD5o4o8Ew3uXWxx3E166EvezE7zx26uzPvDMN0o7DuQLJve5eKEDkvC5kBrttKxJ5R4xrkbQ42Oep\n\tFfKaVV2rOl5WzzQcM3GlfeWP6gh+M480RQhRsjB+JFZKK2Q8/h/oHvjbu0kqkFBIXuJU1rjUXnnST\n\tYQJrBwlOv60rZrPcG0T1jDPguwoTM0JFMKnw8VFvkSjqwB5pMDc3+y1JF7Cw9XK7cguGK51gd0zP7\n\tAGQ1WZEA==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1775081196; x=1806617196;\n h=from:to:subject:date:message-id:in-reply-to:references:\n mime-version:content-transfer-encoding;\n bh=6ERcw+AXyV8nWJtIS5dp+9DGEV3nDJ9I9IboGzbIUfQ=;\n b=cPPrxFyh0dOORkruiQOl3Y6M/OznQRaDbA8BeWALwHRit6np8ORzA4X2\n GpJlEdaUOgjaqNj9B/tGgmDceh8Z6AmT8EplFDGEGCGWeScnPOU8aB06d\n 4kIim4T4CyJgJwkAp7CAqyTNo4vtE6SU1o0+qVXalEFs+irckFLxlJFed\n BZaOJshYveOiXgxDHz/g9SZZlbEV2yl0/UI0u5YyrA5AKWAOE7YAQFBNl\n rPpUUye6i4S1AoPRzZxahnL5DSlx8jdSOFs+M5O6tE/1itCZpNlMq0Qyi\n KRk+SLJGXdSL5fI8ioquVvoTp5iM7HUlNxn5ZlbR8wEHsxJ87qv3oZf0l\n w==;"],"X-CSE-ConnectionGUID":["DPnbG6OJQVqYtrqgecycwQ==","J1fqPaZ3SnWpNDjNzeg07g=="],"X-CSE-MsgGUID":["z9eKEfnTTNSvAmMWqVUntQ==","1NYLOMYVSlyAM3jQHbMpKg=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11746\"; a=\"75851653\"","E=Sophos;i=\"6.23,153,1770624000\";\n d=\"scan'208\";a=\"75851653\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Subject":"[PATCH 55/71] wpa_supplicant: Set availability attribute in NAN\n schedule config","Date":"Thu, 2 Apr 2026 01:02:04 +0300","Message-ID":"<20260401220220.4418-56-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_230637_890884_24FCCDB1 ","X-CRM114-Status":"GOOD ( 16.80 )","X-Spam-Score":"-0.0 (/)","X-Spam-Report":"Spam detection software,\n running on the system \"desiato.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: Kernel requires NAN Availability attribute to be configured\n in local schedule configuration. This is needed as the device may need to\n include it in some internally generated schedule update frames. Do [...]\n Content analysis details: (-0.0 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_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 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 -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_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 -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":"Kernel requires NAN Availability attribute to be configured in local\nschedule configuration. This is needed as the device may need to include\nit in some internally generated schedule update frames.\nDon't include the potential availability entries, as they might be very\nlarge and not really needed for device/kernel generated frames.\n\nSigned-off-by: Andrei Otcheretianski \n---\n wpa_supplicant/nan_supplicant.c | 48 ++++++++++++++++++++++++++++++---\n 1 file changed, 44 insertions(+), 4 deletions(-)","diff":"diff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex a00d92cb68..736ea6af2e 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -38,6 +38,8 @@\n #define NAN_MIN_RSSI_CLOSE -60\n #define NAN_MIN_RSSI_MIDDLE -75\n \n+#define NAN_AVAIL_ATTR_MAX_LEN 100\n+\n #ifdef CONFIG_NAN\n \n static int get_center(u8 channel, const u8 *center_channels, size_t num_chan,\n@@ -154,6 +156,7 @@ static void clear_sched_config(struct nan_schedule_config *sched_cfg)\n \tfor (i = 0; i < sched_cfg->num_channels; i++)\n \t\twpabuf_free(sched_cfg->channels[i].time_bitmap);\n \n+\twpabuf_free(sched_cfg->avail_attr);\n \tos_memset(sched_cfg, 0, sizeof(*sched_cfg));\n }\n \n@@ -1169,11 +1172,17 @@ static void nan_dump_sched_config(const char *title,\n }\n \n \n+static void wpas_nan_fill_ndp_schedule(struct wpa_supplicant *wpa_s,\n+\t\t\t\t struct nan_schedule *sched);\n+\n+\n /* Parse format NAN_SCHED_CONFIG_MAP map_id= [freq:bitmap_hex]..\n If no bitmaps provided - clear the map */\n int wpas_nan_sched_config_map(struct wpa_supplicant *wpa_s, const char *cmd)\n {\n \tstruct nan_schedule_config sched_cfg;\n+\tstruct nan_schedule_config old_sched_cfg;\n+\tstruct nan_schedule sched;\n \tchar *token, *context = NULL;\n \tu8 map_id;\n \tchar *pos;\n@@ -1363,20 +1372,51 @@ int wpas_nan_sched_config_map(struct wpa_supplicant *wpa_s, const char *cmd)\n \t\t}\n \t}\n \n+\tsched_cfg.avail_attr = wpabuf_alloc(NAN_AVAIL_ATTR_MAX_LEN);\n+\tif (!sched_cfg.avail_attr) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to allocate memory for Availability Attribute\");\n+\t\tret = -1;\n+\t\tgoto out;\n+\t}\n+\n+\t/* Keep previous schedule configuration as we may need to restore it */\n+\tos_memcpy(&old_sched_cfg, &wpa_s->nan_sched[map_id - 1],\n+\t\t sizeof(old_sched_cfg));\n+\n+\tos_memcpy(&wpa_s->nan_sched[map_id - 1], &sched_cfg,\n+\t\t sizeof(sched_cfg));\n+\twpas_nan_fill_ndp_schedule(wpa_s, &sched);\n+\n+\tret = nan_convert_sched_to_avail_attrs(wpa_s->nan,\n+\t\t\t\t\t wpa_s->schedule_sequence_id + 1,\n+\t\t\t\t\t BIT(map_id), sched.n_chans,\n+\t\t\t\t\t sched.chans, sched_cfg.avail_attr,\n+\t\t\t\t\t false);\n+\n+\tif (ret < 0) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Failed to convert schedule to Availability Attributes for map_id %d\",\n+\t\t\t map_id);\n+\t\tos_memcpy(&wpa_s->nan_sched[map_id - 1], &old_sched_cfg,\n+\t\t\t sizeof(old_sched_cfg));\n+\t\tgoto out;\n+\t}\n+\n \tnan_dump_sched_config(\"NAN: Set schedule config\", &sched_cfg);\n \tret = wpa_drv_nan_config_schedule(wpa_s, map_id, &sched_cfg);\n \tif (ret < 0) {\n \t\twpa_printf(MSG_DEBUG,\n \t\t\t \"NAN: Failed to configure NAN schedule map_id %d\",\n \t\t\t map_id);\n+\t\tos_memcpy(&wpa_s->nan_sched[map_id - 1], &old_sched_cfg,\n+\t\t\t sizeof(old_sched_cfg));\n \t\tgoto out;\n \t}\n \n-\t/* Store the configured schedule */\n+\t/* Free the old schedule and keep the new one (already stored) */\n \twpa_s->schedule_sequence_id++;\n-\tclear_sched_config(&wpa_s->nan_sched[map_id - 1]);\n-\tos_memcpy(&wpa_s->nan_sched[map_id - 1], &sched_cfg,\n-\t\t sizeof(sched_cfg));\n+\tclear_sched_config(&old_sched_cfg);\n out:\n \tos_free(bf_total);\n \tos_free(shared_freqs);\n","prefixes":["55/71"]}