From nobody Fri Jan 16 19:40:48 2026 X-Original-To: dev-commits-src-branches@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 4dt9FF34X1z6NlVY for ; Fri, 16 Jan 2026 19:40:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9FD3vbnz3xC4 for ; Fri, 16 Jan 2026 19:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592448; 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=LQddb6CBPkTyVRcVCXp+g9ihYB1ljqMPaBx0pSQdvsk=; b=Nie/L6Vsnh/aApwJEd27lmG+l0j0FsjOrvq9/O5DdJO/ey0JRmWzKZ+qQeRvGeT16NlKgp Od3tvcJcv4I4HmIHFNMA71ticUcDy2HGZnLLgllvlGIgEbKywZ8JQpeK/Pg2BRBnqnEBzQ cqU7QWQU9MpuHzrQZVvqqmNDI+kfWISNgMknmj03dDfeBM4ATa/wS8GIAnblvlQCHpmmXC H/89ruGRoG5qg1hNJnFJITajW023/P/G3lOAfdbSKIBFXC5rHrnW79DLL+p8ljmiRdu94U 8w8JQC/e7tmAn/awPOtqmkAqGL19vEiKpGA5GBi3zul3NAURzzM6IDcUOlGrmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592448; 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=LQddb6CBPkTyVRcVCXp+g9ihYB1ljqMPaBx0pSQdvsk=; b=VShR7jZ4TwMoIBZId72kdMSzXA0C0e6LLyqjfLjxMYqhU5Ayicb5YzvsIWTyb3rRemLRBz EL3fMBINf8q7/D7YppXmV/haFl+g6qxyOt14ZsExwciDo/bztY4szNuCUGVRpo0JsQJbXG kFQLG3QYe4MaygbMqk9RTBojd0jl+L361F4V8Ris2qYsPdMcXpt/Bv0sxrm3J1eUdoeliU somMG442z7Fy3nI+Lx3sL/zT5DuvbvAyGekwF1ac16BNxAdNNvVGTFru7NjFGJmhYeSYW7 vGRngnfuxQenASoPVBo7DYXlu97zHfsDT9ArUmXowUjsLET76aoeMwo1oLT3KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592448; a=rsa-sha256; cv=none; b=TN0QwJnIguv6KGxoVDiLenqx4irY5hiaQDvA/1sSy6xVDlSaZoh9Kfa8U9/JfNG2ynv1m8 me4cqBMDGc0fFGQ/cIJD7D9qviBupzYBseaJZr68GXCySvAV099YCR1z4tx3jbAMAE8511 wTjk3o4PIcdi2RwMSQz3MF/xJXWxpoTf5UPB2Z4BE14lKFdUTEVeuFErp06yA/REO48nb7 cJ1Sgk0qzxgodrkRcPGgceuS3niKf5d+q/kqyv99r8zFjM5lqlK6RlXQ985OhYgaX6FT32 Ff7/mNoZWUOe7vVXZ2ln1qHXY6eOnNbSnvFrx5rxHtSdsxQe++QUHNdFfrqJDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9FD33ZFzCLl for ; Fri, 16 Jan 2026 19:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dc06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 2c48a938d570 - stable/14 - LinuxKPI: skbuff: no longer use IEEE80211_DEBUG to turn on debug List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 2c48a938d570b895002b16f78133ff4256efea1d Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:48 +0000 Message-Id: <696a9440.dc06.6b521308@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2c48a938d570b895002b16f78133ff4256efea1d commit 2c48a938d570b895002b16f78133ff4256efea1d Author: Bjoern A. Zeeb AuthorDate: 2025-09-03 11:01:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:46 +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 (cherry picked from commit bc222e96d135687aea4e67ee9b11fb9490f42546) --- 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