{"id":2229883,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229883/?format=json","web_url":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-74-andrei.otcheretianski@intel.com/","project":{"id":22,"url":"http://patchwork.ozlabs.org/api/1.1/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":"<20260428200639.40243-74-andrei.otcheretianski@intel.com>","date":"2026-04-28T20:06:14","name":"[73/97] NAN: Skip peer schedule update when local schedule update is pending","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"763b17f548ee5b1970ed20d144621cf4849d484a","submitter":{"id":62065,"url":"http://patchwork.ozlabs.org/api/1.1/people/62065/?format=json","name":"Andrei Otcheretianski","email":"andrei.otcheretianski@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/hostap/patch/20260428200639.40243-74-andrei.otcheretianski@intel.com/mbox/","series":[{"id":501927,"url":"http://patchwork.ozlabs.org/api/1.1/series/501927/?format=json","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/2229883/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229883/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=xs9G1kGa;\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=casper.20170209 header.b=bBB11mBy;\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=YQOsQ/Og;\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 4g4s96152tz1xrS\n\tfor ; Wed, 29 Apr 2026 06:14:34 +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 1wHoon-00000002L83-1ubS;\n\tTue, 28 Apr 2026 20:14:05 +0000","from casper.infradead.org ([2001:8b0:10b:1236::1])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHokq-00000002Fdo-2V7D\n\tfor hostap@bombadil.infradead.org;\n\tTue, 28 Apr 2026 20:10:00 +0000","from mgamail.intel.com ([198.175.65.16])\n\tby casper.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wHokk-00000004NYt-08XY\n\tfor hostap@lists.infradead.org;\n\tTue, 28 Apr 2026 20:09:58 +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:09:07 -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:09:06 -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=IsCt9l+UnteoVMdY3Ru/eNkBGrKP1XacZefm6WNZGps=; b=xs9G1kGaMx6sH3\n\tOabUzsJYkExPxgIb+GwTqgX8D2EeBwvyvkdsbUlrQn5nlmvhrVxzfKGquPQc6/CeBdMnZ7/VQ4yum\n\txk2q0488udSdG2+QdGyQELkdSItKKahLnzaiJf0sHFENWrU8k5NzNYPpspTQUx9TquA/xsDxGPwUk\n\tHBMSB/JxsXcTxaxsLl6B4R3cDeStfpDS1NK9x9egCGy9auJ+fxxgFRmn7NXKtOQ5mA04Pz32Lhch0\n\tXHrduIj5GgeTMGuZPsfPZcjU2YEvuQJ4cO2h2wElpusZJA9mJsE1MBz3It5f8tDuiZOAPUdFsswwl\n\tZdm//iDitgNqsPGmvrxg==;","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version:\n\tReferences:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=d5q2r1wqt1jpYGtUoXn7smjwHGXmk0glZflJB7INUnw=; b=bBB11mByaojvCG2XfXe/FKhBxl\n\tSTxs3blqSZozJ2I1guVUl2ZC93vHhZmDLSeJkOCjIm/An2oKX0QzIQx/z9TwZiLPk9FQ1TbYQSgKd\n\tv4MKj5NDU9Y91MJB0MiWG9cEuQIthpqSNdrTSkcO8ETaRPGL9HoB2S5cCdlpYygisUsWAmAM0ZM+0\n\taQhkDfc+utEOYzOp0tJnk18nBh1RGLn080hT8IWSFc9pZJmzduoO9GQnc994GC5T+/NM5sEV2d6dQ\n\tbFKPCaTNiaEczBB8RgfE1UcXu8l5e7fCDQ5YqgancWmosMUmBBx+djq5aZTXuW0R/Sb8GPkG7lSpW\n\tE/WrTPnQ==;","v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777406994; x=1808942994;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=ZvUb7R82DZe8/ISBLbNpHmhHeoBwTMGu1kndz1GTLpY=;\n b=YQOsQ/Ogz2z/yTMKv5h2JTvqQV9DOoiNb6OFmLLogYXF7YFgtqyNB4fR\n zUMVtuAHSknRQ7HBVOyXwn47fhsBNlAO4DbmapjUaEmOn/SFcTnFNEv6c\n Fs0z6QrC4975VQ3DGdRGtcbA5AqaHDCjBKFukCQP8u1geQlOdbmc7AiJf\n I/7RxnWnHgxS0Gzg17rIJ35LiMX2JiInINNnD5phSBIgnN1s3O/wjfRHU\n /TXu5/D43jtnMbeAiWbAJF+BmPwG2xkZOrei4K6g4GczNJmWADVPgdIBQ\n g6Cigo2y4wirKXtrJ3jnSMxIrnkEsBRakn2KhJcm0RcBraNs0PbvH2mdL\n g==;"],"X-CSE-ConnectionGUID":["cXcWh4SAR5msNO0f5SwOCw==","geHewx/HT4yxQw/zE/sLCg=="],"X-CSE-MsgGUID":["B79e+PUNQaK/T3vF90bFlg==","BPub8C42QkSNH6LtWKsaeQ=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11770\"; a=\"78519526\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"78519526\"","E=Sophos;i=\"6.23,204,1770624000\";\n d=\"scan'208\";a=\"257610760\""],"X-ExtLoop1":"1","From":"Andrei Otcheretianski ","To":"hostap@lists.infradead.org","Cc":"vamsin@qti.qualcomm.com,\n\tmaheshkkv@google.com,\n\tAndrei Otcheretianski ","Subject":"[PATCH 73/97] NAN: Skip peer schedule update when local schedule\n update is pending","Date":"Tue, 28 Apr 2026 23:06:14 +0300","Message-ID":"<20260428200639.40243-74-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_210954_484159_390D426E ","X-CRM114-Status":"GOOD ( 15.21 )","X-Spam-Score":"-4.4 (----)","X-Spam-Report":"SpamAssassin version 4.0.1 on casper.infradead.org summary:\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.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 Message has at least one valid DKIM or DK\n signature\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_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.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":"","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":"When a local NAN schedule update is in progress (deferred mode due to\nactive NDP), peer schedule changes may trigger peer schedule reconfiguration\nto the kernel. Since the kernel may already have processed the new\nschedule, and the supplicant still uses the previous local schedule for\npeer channel filtering, it may result in inclusion of peer channels that were\nalready removed from the local schedule. The kernel rejects such\nupdates and this may result in NDP disconnection.\n\nTo prevent this race, skip the kernel peer schedule update when a local\ndeferred schedule update is in progress. The peer availability info\nis still stored, and when the driver confirms the local schedule update,\nall peers are updated anyway with the correct local schedule intersection.\n\nSigned-off-by: Andrei Otcheretianski \n---\n src/nan/nan.c | 19 ++++++++++++++++++-\n src/nan/nan.h | 1 +\n src/nan/nan_i.h | 2 ++\n wpa_supplicant/nan_supplicant.c | 3 +++\n 4 files changed, 24 insertions(+), 1 deletion(-)","diff":"diff --git a/src/nan/nan.c b/src/nan/nan.c\nindex f347588f09..0d7110c98a 100644\n--- a/src/nan/nan.c\n+++ b/src/nan/nan.c\n@@ -1517,7 +1517,14 @@ int nan_configure_peer_schedule(struct nan_data *nan, struct nan_peer *peer,\n \tstruct nan_peer_schedule sched;\n \tstruct bitfield *common_bf;\n \n-\twpa_printf(MSG_DEBUG, \"NAN: Configure peer schedule\");\n+\twpa_printf(MSG_DEBUG, \"NAN: Configure peer schedule for \" MACSTR,\n+\t\t MAC2STR(peer->nmi_addr));\n+\n+\tif (nan->sched_update_pending) {\n+\t\twpa_printf(MSG_DEBUG,\n+\t\t\t \"NAN: Skip peer schedule config - local schedule update pending\");\n+\t\treturn 0;\n+\t}\n \n \tos_memset(&sched, 0, sizeof(sched));\n \tcommon_bf = nan_peer_schedule_intersection(nan, peer, local_sched);\n@@ -3364,6 +3371,16 @@ bool nan_has_active_ndp(struct nan_data *nan)\n }\n \n \n+void nan_set_sched_update_pending(struct nan_data *nan, bool pending)\n+{\n+\tif (!nan)\n+\t\treturn;\n+\n+\twpa_printf(MSG_DEBUG, \"NAN: Set sched_update_pending to %d\", pending);\n+\tnan->sched_update_pending = pending;\n+}\n+\n+\n void nan_local_sched_update(struct nan_data *nan, struct nan_schedule *sched)\n {\n \tstruct nan_peer *peer;\ndiff --git a/src/nan/nan.h b/src/nan/nan.h\nindex 1b25783506..811516ac53 100644\n--- a/src/nan/nan.h\n+++ b/src/nan/nan.h\n@@ -844,6 +844,7 @@ int nan_convert_sched_to_avail_attrs(struct nan_data *nan, u8 sequence_id,\n \t\t\t\t struct wpabuf *buf,\n \t\t\t\t bool include_potential);\n void nan_local_sched_update(struct nan_data *nan, struct nan_schedule *sched);\n+void nan_set_sched_update_pending(struct nan_data *nan, bool pending);\n bool nan_peer_pairing_supported(struct nan_data *nan, const u8 *addr);\n bool nan_peer_npk_nik_caching_supported(struct nan_data *nan, const u8 *addr);\n int nan_get_peer_ndc_freq(struct nan_data *nan,\ndiff --git a/src/nan/nan_i.h b/src/nan/nan_i.h\nindex f4fad1bd39..3c8e94958c 100644\n--- a/src/nan/nan_i.h\n+++ b/src/nan/nan_i.h\n@@ -568,6 +568,7 @@ struct nan_peer {\n * struct nan_data - Internal data structure for NAN\n * @cfg: Pointer to the NAN configuration structure\n * @nan_started: Flag indicating if NAN has been started\n+ * @sched_update_pending: Local schedule update is pending driver confirmation\n * @peer_list: List of known peers\n * @ndp_id_counter: NDP identifier counter. Incremented for each NDP request,\n * and is used to set ndp_id in &struct nan_ndp.\n@@ -587,6 +588,7 @@ struct nan_peer {\n struct nan_data {\n \tstruct nan_config *cfg;\n \tu8 nan_started:1;\n+\tu8 sched_update_pending:1;\n \tstruct dl_list peer_list;\n \n \tu8 ndp_id_counter;\ndiff --git a/wpa_supplicant/nan_supplicant.c b/wpa_supplicant/nan_supplicant.c\nindex eb2ac88e4a..c5626d7dcc 100644\n--- a/wpa_supplicant/nan_supplicant.c\n+++ b/wpa_supplicant/nan_supplicant.c\n@@ -2218,6 +2218,7 @@ int wpas_nan_sched_config_map(struct wpa_supplicant *wpa_s, const char *cmd)\n \t\twpa_printf(MSG_DEBUG, \"NAN: Set schedule config as deferred\");\n \t\tsched_cfg->deferred = true;\n \t\twpa_s->nan_sched_update.map_id = map_id;\n+\t\tnan_set_sched_update_pending(wpa_s->nan, true);\n \t}\n \n \tnan_dump_sched_config(\"NAN: Set schedule config\", sched_cfg);\n@@ -2228,6 +2229,7 @@ int wpas_nan_sched_config_map(struct wpa_supplicant *wpa_s, const char *cmd)\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\tnan_set_sched_update_pending(wpa_s->nan, false);\n \t\tgoto out;\n \t}\n \n@@ -3406,6 +3408,7 @@ void wpas_nan_sched_update_done(struct wpa_supplicant *wpa_s,\n \t\treturn;\n \t}\n \n+\tnan_set_sched_update_pending(wpa_s->nan, false);\n \twpas_notify_nan_sched_update_done(wpa_s, success);\n \n \tif (!success) {\n","prefixes":["73/97"]}