From nobody Mon Jun 29 06:34:10 2026 X-Original-To: dev-commits-src-all@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 4gpc1t2bW0z6k546 for ; Mon, 29 Jun 2026 06:34:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpc1t1crxz4GSn for ; Mon, 29 Jun 2026 06:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782714850; 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=pKvXiqDI/HkQrphIlS92XcfucyBBvqeNMqVeiJjLHDc=; b=MSPkDlzoyJWUTLxHestsCFO+v2ld0JETUQm09ohn43f26jmSPoMmYBmgzp2l3RXyH93PNE 1nXV0o0+7J/Am84TqLx7OeFsjskQL73dJMvmuljWcSHkbEttcv79IrqNx9aB/GJBisEeRK dDBl5bBsqR9CDCH63+DowJ/G7SgSj6R5hnZDNrV0JKynE4ReSlzd1hJJDpp9nPCXx3eNZT Xr7F5Q/+S74wqSDyCBO+XmIOqUwGjmfm0Jlsi8P9R7mxQITLdtzDElpnyLthLK93sQQKRu 9wHu0K8TRbxTc2QWZjbXhNZLB2X7Cn+Rw9CT+4Jgeb3qK5TL0xQ9FcSHU3wKBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782714850; a=rsa-sha256; cv=none; b=OjvgfCzvT5ekfQwDIRXKBephmqvGj+AW1GFFOUkxicBbi7yZtEChFPlnoxEeGFRTBAMMYj A/T1RM0uVhnWy5h3RWybl1Qsy3NehzSs5oxHTKMmfSMscFUNu3LSR1BXxZP/+ZRMt2xtq9 HR3prW9LCI80Wt46icx2DpK4uznKeo8iDYtO8PwOpY7PxJrpdZMNVDXks2FwSaowwsLK8I 180gQ+Dptpdy44PW1Cp/t0LFKNbA5VW+jW/VaUQQQ/JwYgbJugGCdutYBOLrsnrTj4jxzK yaXTepppn4UA6QDCaVPMRl8eKAXdysSHQsFfuw64PW3PtiSmCgAaf6zEzeCi3g== 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=1782714850; 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=pKvXiqDI/HkQrphIlS92XcfucyBBvqeNMqVeiJjLHDc=; b=ClDAcff4jvmz8Qx7ryoeY2TzVtmiIa6w3/B5NSyDatT3O0UcfQ4ns9MnP7XOiH5aOqSqq+ 6BFVgRg66ad0u8LmFlfd4DRD8xUj6YZGR1nCwj/R9RegKIpqUXgE5p54l+2FZgwM2KfgNW hVf8VoksmwGr3svF45thWubjhFtPFtPzcSL3EdG5HiUl9JT2LI1vddW9v2TJWJowNH4xJ4 wNnhhm6CyVvEMgNzvo9AGBJmsHYlK718/AOZuCqo9MjuOSYZRz7XctkTzS7K4Fo2csGRT7 kApsIZ7IQClyOS6Zo4vLjpCARGMk5xS04nPAVLm6EBIetqybuNjcTt/oCfkocw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpc1t0T58zmRY for ; Mon, 29 Jun 2026 06:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46744 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 06:34:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: a792bb723609 - stable/15 - LinuxKPI: 802.11 suspend/resume: fix the is_pci_dev check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a792bb723609c27857c8b7a267bd145617ece84e Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 06:34:10 +0000 Message-Id: <6a4211e2.46744.109b642a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a792bb723609c27857c8b7a267bd145617ece84e commit a792bb723609c27857c8b7a267bd145617ece84e Author: Bjoern A. Zeeb AuthorDate: 2026-05-30 21:33:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-06-29 03:50:03 +0000 LinuxKPI: 802.11 suspend/resume: fix the is_pci_dev check Shortly before I committed the works from a year ago, jhb added a function ("is_pci_device") so that the check against the devclass does not have to be coded in every driver. Use this instead in main (and stable/15 in case the works get MFCed). At the same time this fixes the check (the old one was wrong) as we attach to the LinuxKPI 802.11 driver, e.g., iwlwifi and thus we need to check the parent of the parent and not just the parent to be of the devclass "pci" in the identify bus function. The was the first error. The second was (and this is why it worked) that we checked for == instead of != and so the wrong check became true again. Discussed with: jhb Fixes: 11d69a4558de ("LinuxKPI: 802.11: add support for s/r") Sponsored by: The FreeBSD Foundation (cherry picked from commit d07460f194835410b6a0e99af6b9721b872fb009) --- sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c b/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c index c69288bd5886..cf9384bf53f2 100644 --- a/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c +++ b/sys/compat/linuxkpi/common/src/linuxkpi_80211_pm.c @@ -13,6 +13,7 @@ #include #include +#include #include "linux_80211.h" #include @@ -139,7 +140,7 @@ lkpi_80211_pm_identify(driver_t *driver, device_t parent) return; /* Make sure this is PCI for now. */ - if (device_get_devclass(parent) == devclass_find("pci")) + if (!is_pci_device(parent)) return; if (BUS_ADD_CHILD(parent, 0, driver->name, DEVICE_UNIT_ANY) == NULL)