From patchwork Mon Apr 29 11:51:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 1928950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ZKsBuPO1; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=sipsolutions.net header.i=@sipsolutions.net header.a=rsa-sha256 header.s=mail header.b=crpO6I/u; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VShXV2tFMz1ymX for ; Mon, 29 Apr 2024 21:52:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=z7WkXJySSXTt0fYuAsaOrKVx5kBjKE8JAXueWnOXasA=; b=ZKsBuPO1XGsKrO nVLZfLQiU6MvuuTMUCFYdzp51V4sW/s/hcO696RIVtTDBJw3frzzxNsTa0j4oKlqTl5fonTVZs396 4r4G113vsry3c3xPNL5QMMfX22d+8oZ2eyI0eiIDcq1Y7gweNDz4Z/SQr/l1SP9ZPYUDNv0z/2zr+ TpERAzCyxlbdyibZEhOXnjUbFYzY394k5nO9eu4/XuFaNdrpGSbt0fZJ+ZE6SIaCDm2RpbdGbLvKX OutKSsDAMwhSujIWyuuNkQceTjOeQa+akvbYfoUzse9dz4WwBApow8/BqGSkpO9k6i0I4XbFSrWkD EdptufbZa/XHxb6HXj/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1PYP-00000002XC0-04m6; Mon, 29 Apr 2024 11:52:17 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:242:246e::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1PYJ-00000002X7x-0KVz for hostap@lists.infradead.org; Mon, 29 Apr 2024 11:52:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=nkbYzOmAEyQDLZRK40TuE55kPZgJ7vBNZT7FrZ/Nrns=; t=1714391528; x=1715601128; b=crpO6I/uTrS7kQVTSRMm2I+PVBHt5HSyx+Uv/DHCEMcassa gvCTsISdSJzad2msM2lNLQZY6KWYP1J48PcMtXZ49XV7AKH1kHB7WCWNFVV8B7/kWcRQ513JJEyui RuX3FIzucAl388r0FQu9HdaHlhM6TgU9NzrYu4OXUvlkHrAZnw5DJ2KkYDPbGsWm6nf1HnQEOxGEy I2YuSz32wLtMlkFKqYXcCEhoFLpPicYiGTN5bELalyVbNp0/OvnX4yIEmYE1WHYaIgbbTXsT/BZJd iZmIKKHtn2CPCDYge7Cyw6feUbeUwjICGGmIqCQeS3nPaUYbzOBkxpehDLzra23w==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.97) (envelope-from ) id 1s1PYE-0000000CNIg-1v4e; Mon, 29 Apr 2024 13:52:06 +0200 From: benjamin@sipsolutions.net To: hostap@lists.infradead.org Cc: Benjamin Berg 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> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240429115157.211073-1-benjamin@sipsolutions.net> References: <20240429115157.211073-1-benjamin@sipsolutions.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240429_045211_386788_1C2B5A20 X-CRM114-Status: GOOD ( 10.02 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Benjamin Berg Just simplify the code a little bit by using the helper instead of doing the math inline. Signed-off-by: Benjamin Berg --- 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 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Benjamin Berg Just simplify the code a little bit by using the helper instead of doing the math inline. Signed-off-by: Benjamin Berg --- 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.