From nobody Sat Sep 28 10:38:12 2024 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 4XG3hP0hKbz5X8M9; Sat, 28 Sep 2024 10:38:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG3hN62BJz46v0; Sat, 28 Sep 2024 10:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727519892; 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=9eCmaYVkICN94cnTkAHU6s0U8mBTQlJOPZV4QAtXJKU=; b=eBG0lS0DcmnIBQ6SM+grcWYnBjxQwHhMW2ZnwuoCAkoU6vEM85ZYD8CExlX2emcWqO46vB iE0mc4FXa/UXCpU4duRQUIF7eVypiwZ+bBWQMEDDl3UgVV+hADMALENW6qiFK1TN/B7Gxl FbJSZIJ0Vq9lxHqxEDqrjwua5lmhRbiBGqTtEFKFWVKeInkQKgU6MvH8eE0uNRniSUXs1N t56t4O68trv3JrhHFRVGBN5j9ESKSi592bB+pU+fM6xW8GNXBIQVbouKvTNywKE73S4Ddq 9kahuWIzNv6chhkxITaSgCVUG6yCUyhfahWu+JrPmqqvapp3hAVuzbBIn8pfrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727519892; 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=9eCmaYVkICN94cnTkAHU6s0U8mBTQlJOPZV4QAtXJKU=; b=bCy06abwmx2Q11xzDcgPTCA2NqBthTIJV8Sf+kgYMkrAvt8KdGr/eEFNT83hsDhdrW1khs HKNJnfLtUZc5B2XsNgIdKlzt8XuUflK0QATgSKWR7M+VpZjFbUOoFtQpSQzZDsEjXhH+Cx aqBpqZaQ2XTFVIE5Cb+/H1yoZIvYBI/UeqcT+3XmEGZSU5wt6to+0hj98Dguh8EFmo+NCq ZTNVTo9Hosnf/FyszyG2RqVBJdvfwx03Y6YSBFirjR95ZCN2qeuOUC2h8jAQo6LlcrqUNk j00+L6kmRxBKu+LETctyC2ZlGutrb0jLjhEs36W5AjCsDmDF5xPSjfvTJE9KOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727519892; a=rsa-sha256; cv=none; b=cZjQCtoCNIp/lvTu33Y2ZppHcRPHM5FOkWKUn7Q4jmUzWSqLWLBk/OtyZeWJ8reOkBt1nR rt9MjB9IZgd8PhMzruE8jr5MU5JhWXDB5MygVeZREgDn0cavslTMlcNjQTsZR6jz16mgyD WZKxqVGNm3iid9ZMj7HmBpW04XO4ZFzeR6Bi9WE8IYqRUdS/OFNYWhNBYg7zz814Z+HQC+ 667ox0s8dKdfgUOYlsYSgBBV+LyOIOdfZBcSTP0lhdbcFL1uXLPi1DCvMDwP+IoEAwnmnS qFytF8PALMjVDAqJIBfwEeIEVdTPQIlNY7D+thsuqGl0kC2qCqIgrjS4mPOfJQ== 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 4XG3hN5fF9zLrC; Sat, 28 Sep 2024 10:38:12 +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 48SAcCLf097717; Sat, 28 Sep 2024 10:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SAcC4K097714; Sat, 28 Sep 2024 10:38:12 GMT (envelope-from git) Date: Sat, 28 Sep 2024 10:38:12 GMT Message-Id: <202409281038.48SAcC4K097714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: af034dcbb242 - stable/14 - LinuxKPI: 802.11 compile in debugging based on IEEE80211 debugging 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 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: af034dcbb24248f940595d56fab332d008376a99 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=af034dcbb24248f940595d56fab332d008376a99 commit af034dcbb24248f940595d56fab332d008376a99 Author: Bjoern A. Zeeb AuthorDate: 2024-04-06 21:17:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-09-28 10:35:12 +0000 LinuxKPI: 802.11 compile in debugging based on IEEE80211 debugging If IEEE80211 debugging is turned on in kernel configs also turn on LinuxKPI 802.11 and SKB debugging (sysctls) to have them available. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45820 (cherry picked from commit 59d262fe969af5a8a83f0ccd7586c9bd2c8fb1f3) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 8 ++++++++ sys/compat/linuxkpi/common/src/linux_80211.h | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index ee3f427aa6e9..d3839820d3d5 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -46,7 +46,15 @@ #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 + /* #define SKB_DEBUG */ + #ifdef SKB_DEBUG #define DSKB_TODO 0x01 #define DSKB_IMPROVE 0x02 diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index a48cf719c693..80be87ebe231 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -42,6 +42,12 @@ #ifndef _LKPI_SRC_LINUX_80211_H #define _LKPI_SRC_LINUX_80211_H +#include "opt_wlan.h" + +#if defined(IEEE80211_DEBUG) && !defined(LINUXKPI_DEBUG_80211) +#define LINUXKPI_DEBUG_80211 +#endif + /* #define LINUXKPI_DEBUG_80211 */ #ifndef D80211_TODO