From nobody Fri Mar 28 19:04:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZPVLz2Dy1z5rHYR; Fri, 28 Mar 2025 19:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPVLy6szGz3DnH; Fri, 28 Mar 2025 19:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743188667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7kQW6Gvb0Yag5t/Poc/l3MWk1Skryjq28Rwd4MS0TCg=; b=T2PQDWvKcLn3T2G2WSkI849b9du6tSzLlDxInDtefHI0KN79SHOsA1jo0dvVDzXc+9Ifhe K0Fa/Xj8frDSG0APl4XEOy45ZEF2mzTMdO/1VzSPmbZQa8GO1fsSfLWr3fSNO6tQUs24oI fcrMehlAC6tqEmTAL0FfdBphej2kR+bD14gT+R0GjqLUvk5m8B2FQceHTEbnUR3z+Uq4Hu EPJZNWPH7x5g7Cct8g75LFlr//1bFHG3CeWcDc9eXcowaIl5Ew14JZmoQh9VD0QtD/sb7q f/BMGTXF0hL5G/tk88DAMEZBCbzP8ek+K4MJDsa8THwhbwlDuS4GT8vrfZB1Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743188667; a=rsa-sha256; cv=none; b=JcdEdIx9ksuckXFlxlEFABRGUKSXoy9qR/7eTmIbmTHdZxN4WPaKluIBTtulnTzzMj69pD uiNWDug4AxuL8JoSMN3QY2RDjg9ZMZDbOxDr7FSGb3e3G+TozVz/S7/ToIhbVmbbeUrNDy BGxb7p3Rp/wHkKEswWy/6pvbN0YgRfQ8k0ZfhQlxidvZIwVc8r1pn0D5j+XTO/bOi9jAwR 90aDOPDz3qcbXkTzN1XWqXzsiq6cdXWi7+e7CROua6wAyD84FDyG7G1VptWRVHWOw6swl/ C36j01CqvxXlPm7JgcTqzUMGG3RaLPFSwGDGTwXcM6GSram/wuaVgLxCjIYdnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743188667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7kQW6Gvb0Yag5t/Poc/l3MWk1Skryjq28Rwd4MS0TCg=; b=GlMrnyIOVsorav5/6fz5P1VAK3oETVpDppyd/92XCJcPelrnU6KFmCzK1s29OhbY4FFbvr 0lF+61MuxNiw6QddbQbVaYQ3iQGp/z+I5RStUeZp0S8SowI6d9rvbF0exPH52m6AvbAPse GDdmg/PlXOWR+dQXLu9dabczJqAYwjT5HsQlxwoveSbXEqO8TY6eSSJws7gsr1UxOFlQ72 tCtj/+PJOeeDjfJbHNPrZI3Wb6qmz6eyR1p7o4RoiXM0WeJIuknBVikCFKuud/CdLaBqcT p5h0JFXiHoTirN8i18HTx+KBDAJa3nJUNXiqYCF43H+bICqKhl8T62rAoDGpKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZPVLy6DZnzw9c; Fri, 28 Mar 2025 19:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52SJ4Qti022669; Fri, 28 Mar 2025 19:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SJ4QMa022666; Fri, 28 Mar 2025 19:04:26 GMT (envelope-from git) Date: Fri, 28 Mar 2025 19:04:26 GMT Message-Id: <202503281904.52SJ4QMa022666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 3bae83078261 - main - ath: fix athtools common code to correctly init state List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bae83078261cd1d51859f869a7b090aa3b428fc Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=3bae83078261cd1d51859f869a7b090aa3b428fc commit 3bae83078261cd1d51859f869a7b090aa3b428fc Author: Adrian Chadd AuthorDate: 2025-03-27 23:39:42 +0000 Commit: Adrian Chadd CommitDate: 2025-03-28 19:00:22 +0000 ath: fix athtools common code to correctly init state Check req->s instead of s to know if the state needs to be cleaned up first. This error is from a refactor I did years ago. Oops! Differential Revision: https://reviews.freebsd.org/D49545 Reviewed by: thj --- tools/tools/ath/common/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/ath/common/ctrl.c b/tools/tools/ath/common/ctrl.c index 419e6fe8277e..ccea1b13401a 100644 --- a/tools/tools/ath/common/ctrl.c +++ b/tools/tools/ath/common/ctrl.c @@ -87,7 +87,7 @@ ath_driver_req_open(struct ath_driver_req *req, const char *ifname) { int s; - if (s != -1) + if (req->s != -1) ath_driver_req_close(req); /* For now, netif socket, not /dev/ filedescriptor */