From nobody Mon Jan 23 22:11:42 2023 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 4P147y5W03z2t0Vk; Mon, 23 Jan 2023 22:11:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P147y4dmJz3K7n; Mon, 23 Jan 2023 22:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511902; 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=M02Jhy95dJq0PvC/yT18BaAc26cA2rXfwhb0gcxmRuY=; b=NTCKOpKhs3wKKhyakK/lcC3TuArFEdN1VUz5NRMt6RtA6016xAg8Lsnxlh8OPtOjt5gADi J0cy4e0aTYHtWXHyRoFFIfZ3R+gLTxD2wtdnRSE27XqBiML8PN8eZlzjBydGVHA2/3O6Ir O7gpcfOMzeCb/N1PoCrU8HV6b+fN2OSBCMQgNI1Nlv2qJgdORHQjlfROjxESD6/q9gxSDa FWJ6PlY8WYptNyj5yk2mpuqxR8kg9A/ZyyHMumE+NWS1nujEOOEEWc/jLVNHgzVA255Jyt Zj04H8jtmo0MDpkCUHngMYGmW6jnOidjb51wmyq7Fcwo05VlfWOVB1xiLUunpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511902; 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=M02Jhy95dJq0PvC/yT18BaAc26cA2rXfwhb0gcxmRuY=; b=oVJkEpKLYc2nTq5MHym/PXFjew4zEJTo7c4ggNlJs6Qs9LmhSzZD8Pyl7owqrZ6UKLBDNA 0O4pDdFIXTiPBLLWvs/JshSpcehPDPmYvOClClj7P5cqFhaI0PWPfKjxPgBV0vUYIULsl4 vbc3ToFe3XSb1U9gz1REVlZG/jnEwNKS+bFRiNDbjNQiZuemnITk0qufTFYDsvr4h0kABU sNsshOEld2ahhbarsp/A2+2dp0/mUvgUK4N295JgvWqZLur05IYo0VlQ0Dj3lkFDcA+ZDm UUvg+CoErOiUSB/+D9bXThIHwDjLoWKlLHEdqFlaULdd5iD9rwCc4ZTOOqolcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511902; a=rsa-sha256; cv=none; b=OY6cFQSAlkI9/ffkr6WS59HP42P1yl+lIGaUiaW0SX/wW1HUVoOechdvBSyQTyoe5DaxTX hS6PtHrwCFagp4AgXwk+O3YCy1gtb0cvefUv3jvLDBG7BXmsm3rakCjEFh8QffxPeSqVDp LBY1Iyh2zTGg9jw2WL8AsIrb31FQxC7TvQ7tMrktd3xLdP5V6uX7mA5MeZ7DnQt49OTCu0 ClYyUUkWqr/Ahdw9OKKNCYyV6gHsLfwIHT98rHqSsHUmsgsh4jCMMqfv9W8/J68VSV5eP/ 7wDWpgkI9tjQWNGGoAEdcNsDjWFp7EFeGaYNIMUSXtX/yiM5ko6jF1uIfYporg== 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 4P147y34MzzlPD; Mon, 23 Jan 2023 22:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NMBg9p012426; Mon, 23 Jan 2023 22:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBg3U012425; Mon, 23 Jan 2023 22:11:42 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:42 GMT Message-Id: <202301232211.30NMBg3U012425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 655fe04370ad - stable/13 - netlink: make test-includes happy by hiding most of the header contents under _KERNEL. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 655fe04370ad9c1b20f2715662fa925db434e55b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=655fe04370ad9c1b20f2715662fa925db434e55b commit 655fe04370ad9c1b20f2715662fa925db434e55b Author: Alexander V. Chernikov AuthorDate: 2022-10-01 17:01:53 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:01 +0000 netlink: make test-includes happy by hiding most of the header contents under _KERNEL. (cherry picked from commit dddafa8d25c6ba57c64c0363d8a4791470d465e0) --- sys/netlink/netlink_ctl.h | 2 ++ sys/netlink/netlink_debug.h | 3 +++ sys/netlink/netlink_generic.h | 2 ++ sys/netlink/netlink_message_parser.h | 2 ++ sys/netlink/netlink_message_writer.h | 2 ++ sys/netlink/netlink_var.h | 3 +++ 6 files changed, 14 insertions(+) diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h index fb5a8b30e0aa..1310a5a5493a 100644 --- a/sys/netlink/netlink_ctl.h +++ b/sys/netlink/netlink_ctl.h @@ -28,6 +28,7 @@ #ifndef _NETLINK_NETLINK_CTL_H_ #define _NETLINK_NETLINK_CTL_H_ +#ifdef _KERNEL /* * This file provides headers for the public KPI of the netlink * subsystem @@ -100,3 +101,4 @@ uint32_t genl_register_group(const char *family_name, const char *group_name); uint32_t nlp_get_pid(const struct nlpcb *nlp); #endif +#endif diff --git a/sys/netlink/netlink_debug.h b/sys/netlink/netlink_debug.h index 6ff6811c6a5a..5d8fe0352a79 100644 --- a/sys/netlink/netlink_debug.h +++ b/sys/netlink/netlink_debug.h @@ -31,6 +31,8 @@ #ifndef _NETLINK_NETLINK_DEBUG_H_ #define _NETLINK_NETLINK_DEBUG_H_ +#ifdef _KERNEL + #define _DEBUG_SYSCTL_OID _net_netlink_debug #include @@ -79,4 +81,5 @@ SYSCTL_DECL(_net_netlink_debug); +#endif #endif diff --git a/sys/netlink/netlink_generic.h b/sys/netlink/netlink_generic.h index 9b411a67ab2a..f88b6b5f5429 100644 --- a/sys/netlink/netlink_generic.h +++ b/sys/netlink/netlink_generic.h @@ -31,6 +31,8 @@ #ifndef _NETLINK_NETLINK_GENERIC_H_ #define _NETLINK_NETLINK_GENERIC_H_ +#include + /* Base header for all of the relevant messages */ struct genlmsghdr { uint8_t cmd; /* CTRL_CMD_ */ diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 06a6788b7de5..2f802b0961ad 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -28,6 +28,7 @@ #ifndef _NETLINK_NETLINK_MESSAGE_PARSER_H_ #define _NETLINK_NETLINK_MESSAGE_PARSER_H_ +#ifdef _KERNEL /* * It is not meant to be included directly */ @@ -268,3 +269,4 @@ nl_parse_nlmsg(struct nlmsghdr *hdr, const struct nlhdr_parser *parser, } #endif +#endif diff --git a/sys/netlink/netlink_message_writer.h b/sys/netlink/netlink_message_writer.h index 95f6dd8e6da0..424983282e59 100644 --- a/sys/netlink/netlink_message_writer.h +++ b/sys/netlink/netlink_message_writer.h @@ -29,6 +29,7 @@ #ifndef _NETLINK_NETLINK_MESSAGE_WRITER_H_ #define _NETLINK_NETLINK_MESSAGE_WRITER_H_ +#ifdef _KERNEL /* * It is not meant to be included directly */ @@ -248,3 +249,4 @@ nlattr_add_string(struct nl_writer *nw, int attrtype, const char *str) #endif +#endif diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index 40d3870fd795..130f3d40a1a3 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -28,6 +28,8 @@ #ifndef _NETLINK_NETLINK_VAR_H_ #define _NETLINK_NETLINK_VAR_H_ +#ifdef _KERNEL + #include #include #include @@ -140,3 +142,4 @@ int nl_receive_async(struct mbuf *m, struct socket *so); void nl_process_receive_locked(struct nlpcb *nlp); #endif +#endif