From nobody Wed Sep 3 11:40:23 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 4cH0zC4dJ7z66FhM; Wed, 03 Sep 2025 11:40:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH0zC2kB3z3VMH; Wed, 03 Sep 2025 11:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756899623; 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=JvbpKjFqWCwDs0Czs407qRRKiZTwy9HA0esVsNPih54=; b=WosrpFe5IQS212nGQ/ABRhw/ui7/XhhBZth7o/9GJEyCGAJSgxdDH49yDe+QPneOaWyV2L GbEBi+SYlKfFMBdXIT2uQ/aYcNvLY8DvPe0JViMC24n/4chiljTufWQAnc61ytF7mFF799 h339KxIU3+RWKkMINwdBtMYAzqpvsgcxYe9VnyUXsGS2VNpTJhvX9e0IUnaY7gOBFarb8F G6mBCbyi1W3wuZazejho4wg5EYtVNK+Ta34vJgXkPicUXhqnpI3biNxSTgX2RaDkwGo5fr PyoHpZvsjARnivSTw1jqi9OzG2AanHetdRoMBIpGiW4YVsE8nlO5IJI2LzPsWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756899623; 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=JvbpKjFqWCwDs0Czs407qRRKiZTwy9HA0esVsNPih54=; b=RzCIdEjs2K6Th1UlodYuZM2TVtzRvm5JjuUcSawHgqY5i78DaGpw2pUvI5VukFoHEgG0Fr H21jn/YWSBshM/JPNmtRopk/pqq7RXKgR669t42Nh2yG7rp08JfQSh5X4Iegtkbe7EbNVg 60maXlyDUoCOPwvpQ5LVjYARJnRKBGlSp2OynAVl1Se7A/6VtvC58TlQBXq1XVXXkVgBVe Gk81KgOWOM6Sr5BVzaUqPbYCf5TbqDrkTeHKG6+4HMUSj2p7jS8P9bZ2GwGRVUA2S8C9fx lSFUTcu7uLz1cfzHkD7QRy30PQ1Kmzv/n+cOhOg7gC1j3Qt0fts+9b/x5ndGmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756899623; a=rsa-sha256; cv=none; b=nXfOTeP+kRqv64rOu96WEky1ZxLYK43KddI8qYEr/OeV8q4cS392l9L9mmNlVfYWR5dfFn FJoPuQ1YDL34WzkYS+8lgKAsY+jREkwlevsfUarmXTcHwQ3oVrkr40OrYUy/s6S8XbrbbF LUd1HyvENiB4sDC87YkO9kouwfoW5a3MhDRSXzdAecs47/9TSERo+roUkmNIkKHYWtN8SQ 7Hjsemq4p3lg2EBXEatl/+EpH+Ax947c8oA4slDUb4uJviK/9dvMoMLAf0Kqs8DEbZfSNL upCGiPU2w0JtnWygLztMmbXLH7J9IJL+RqSgNRXnw9rohfv0dIClxCBEo02SNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cH0zC2CVRzw6; Wed, 03 Sep 2025 11:40:23 +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 583BeNmC076578; Wed, 3 Sep 2025 11:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583BeN6s076575; Wed, 3 Sep 2025 11:40:23 GMT (envelope-from git) Date: Wed, 3 Sep 2025 11:40:23 GMT Message-Id: <202509031140.583BeN6s076575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bc222e96d135 - main - LinuxKPI: skbuff: no longer use IEEE80211_DEBUG to turn on debug 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc222e96d135687aea4e67ee9b11fb9490f42546 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bc222e96d135687aea4e67ee9b11fb9490f42546 commit bc222e96d135687aea4e67ee9b11fb9490f42546 Author: Bjoern A. Zeeb AuthorDate: 2025-09-03 11:01:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-03 11:01:01 +0000 LinuxKPI: skbuff: no longer use IEEE80211_DEBUG to turn on debug A port using linux(kpi) header files but not using skbuffs is hitting the case that it cannot find opt_wlan.h. Give up to the idea that skbuff.h is only used by wireless drivers (or in-tree) and that IEEE80211_DEBUG (via opt_lwan.h) could autmatically compile in debug support. It is likely time to add a LINUXKPI_DEBUG knob in the near future (also for linuxkpi_debug or linuxkpi_debug_rcu). PR: 289268 MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 0f192ceab318..6e41c368a8b8 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2020-2025 The FreeBSD Foundation - * Copyright (c) 2021-2023 Bjoern A. Zeeb + * Copyright (c) 2021-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -47,13 +47,11 @@ #include #include -#include "opt_wlan.h" - -/* Currently this is only used for wlan so we can depend on that. */ -#if defined(IEEE80211_DEBUG) && !defined(SKB_DEBUG) -#define SKB_DEBUG -#endif - +/* + * At least the net/intel-irdma-kmod port pulls this header in; likely through + * if_ether.h (see PR289268). This means we no longer can rely on + * IEEE80211_DEBUG (opt_wlan.h) to automatically set SKB_DEBUG. + */ /* #define SKB_DEBUG */ #ifdef SKB_DEBUG