[03/16] WNM: Use os_relatime_add_ms helper

Message ID	20240429115157.211073-4-benjamin@sipsolutions.net
State	New
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: benjamin@sipsolutions.net To: hostap@lists.infradead.org Cc: Benjamin Berg <benjamin.berg@intel.com> Subject: [PATCH 03/16] WNM: Use os_relatime_add_ms helper Date: Mon, 29 Apr 2024 13:51:44 +0200 Message-ID: <20240429115157.211073-4-benjamin@sipsolutions.net> In-Reply-To: <20240429115157.211073-1-benjamin@sipsolutions.net> References: <20240429115157.211073-1-benjamin@sipsolutions.net> MIME-Version: 1.0 preview: From: Benjamin Berg <benjamin.berg@intel.com> Just simplify the code a little bit by using the helper instead of doing the math inline. Signed-off-by: Benjamin Berg <benjamin.berg@intel.com> --- wpa_supplicant/wnm_sta.c \| 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Precedence: list 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
Series	BTM refactorings and abridged bit handling \| expand [00/16] BTM refactorings and abridged bit handling [01/16] WNM: Only trigger selection logic for own scans [02/16] WNM: Store whether disassociation address is an MLD Address [03/16] WNM: Use os_relatime_add_ms helper [04/16] WNM: Split candidate list parsing into a separate function [05/16] WNM: Remove unused age parameter for neighbor comparison [06/16] WNM: Swap logic in wnm_is_bss_excluded to allow more checks [07/16] WNM: Move neighbor report test into wnm_is_bss_excluded [08/16] WNM: Move driver MBO transition rejection into wnm_is_bss_excluded [09/16] tests: Set the abridged bit in BTM tests [10/16] WNM: Use standard BSS selection and enable abridged bit handling [11/16] MBO: Always accept BTM request with disassociation imminent bit set [12/16] WNM: Reject requests with an invalid dialog token [13/16] WNM: Consolidate the scanning paths for BTM requests [14/16] WNM: Always parse candidate list [15/16] tests: Add a WNM tests to check candidate list is used if not required [16/16] WNM: Scan for BSSID if there are forbidden neighbors

Message ID

20240429115157.211073-4-benjamin@sipsolutions.net

State

New

Headers

From: benjamin@sipsolutions.net
To: hostap@lists.infradead.org
Cc: Benjamin Berg <benjamin.berg@intel.com>
Subject: [PATCH 03/16] WNM: Use os_relatime_add_ms helper
Date: Mon, 29 Apr 2024 13:51:44 +0200
Message-ID: <20240429115157.211073-4-benjamin@sipsolutions.net>
In-Reply-To: <20240429115157.211073-1-benjamin@sipsolutions.net>
References: <20240429115157.211073-1-benjamin@sipsolutions.net>
MIME-Version: 1.0
Precedence: list
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

Series

BTM refactorings and abridged bit handling | expand

Commit Message

Benjamin Berg April 29, 2024, 11:51 a.m. UTC

From: Benjamin Berg <benjamin.berg@intel.com>

Just simplify the code a little bit by using the helper instead of doing
the math inline.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
---
 wpa_supplicant/wnm_sta.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 015a1948e..7857e4ed8 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -1598,11 +1598,7 @@  static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
 		wpa_printf(MSG_DEBUG, "WNM: Candidate list valid for %u ms",
 			   valid_ms);
 		os_get_reltime(&wpa_s->wnm_cand_valid_until);
-		wpa_s->wnm_cand_valid_until.sec += valid_ms / 1000;
-		wpa_s->wnm_cand_valid_until.usec += (valid_ms % 1000) * 1000;
-		wpa_s->wnm_cand_valid_until.sec +=
-			wpa_s->wnm_cand_valid_until.usec / 1000000;
-		wpa_s->wnm_cand_valid_until.usec %= 1000000;
+		os_reltime_add_ms(&wpa_s->wnm_cand_valid_until, valid_ms);
 
 		/*
 		* Try fetching the latest scan results from the kernel.

[03/16] WNM: Use os_relatime_add_ms helper

Commit Message

Patch