From nobody Mon Jan 03 15:06:11 2022 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 7B944191A9CA for ; Mon, 3 Jan 2022 15:06:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x92a.google.com (mail-ua1-x92a.google.com [IPv6:2607:f8b0:4864:20::92a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSJwv18d7z3wBk for ; Mon, 3 Jan 2022 15:06:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x92a.google.com with SMTP id p1so36154074uap.9 for ; Mon, 03 Jan 2022 07:06:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xk2FQYExxQqlMbWyvbGOf2sETBfFOrzLZtmsPerdHo0=; b=BudfsOKp8XVH/fyl9uIKMmBuzo57+6DLjCmuK6/0c6XNkFGfr7+XPHw4b2INpBZztI YNsQ9vnCnVvcMLb27DYjtBgmg2lj5BE3qenuOf5n3HxYrqKZZcJBmI+AbO4YkROZv7Um qxVMkKi4uwiyNNxjSA1+7b317CkDZSVahpjL8cBjY8UCW78dXqSrN5Gndo9SHs+jYOc7 g2vbIaiR/SmiKld10OBQKwXN+wZkdIG++4FmjhWcnaEqzdFcTrs9nYfSem18NovJQZkC t/SvWAz8jmvrcSMSGTGplvB3W4OXg7dUciG8f695bKl8rGkXZyltoi1WdSJtuEMrRlP9 k+4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xk2FQYExxQqlMbWyvbGOf2sETBfFOrzLZtmsPerdHo0=; b=3adMTm944Linv8MOABb8ZsGyqUV1xMslQPbRgqPQETlpjdcd1TNvKfcJQHdsixGWYl bWA3/VmrmCdq8s6C1wXDEfvNXRKNwIn/CVXzuyGH/GjRsFh7gcyHuYga9/7/TEr1PMhq lZ1FRTS1NbiEvy7ZuOZ3tMqpHU9cRGe12/e3nKQzBeV85LN070kVsqOAXfapSZY9Cy8B 9kejhZOqDxjW/DF51ZbXmSdiYfMCmThart3akJQNRDcweXnY91oKKN134A1kr5LGKWii IsfEmc7zt4zsBMg3ikhc64mF18Mchpe3Nf0a7f5q7l2PH6nq8Too4CKX8x9Rc+wTQmKB 1xtA== X-Gm-Message-State: AOAM533jZzGtY7CNjlopJxlmgaXz/iae+UlLtuKqGduGQNpe3yHEae27 QfnAmHXX+YL+jJ6Y+skItBALL12QEvDjBBtVGdk1tWx7XOw= X-Google-Smtp-Source: ABdhPJzUmDt9zp8PNScEumqks9BIQFOW3m1zIHvvkNCVX07nJ81T2itS+SCBJKfqppeBuI3tYVDOk86Wcw/ClgFEY/w= X-Received: by 2002:ab0:4405:: with SMTP id m5mr14886619uam.11.1641222382350; Mon, 03 Jan 2022 07:06:22 -0800 (PST) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202201031256.203Cu0hT084458@gitrepo.freebsd.org> In-Reply-To: <202201031256.203Cu0hT084458@gitrepo.freebsd.org> From: Warner Losh Date: Mon, 3 Jan 2022 08:06:11 -0700 Message-ID: Subject: Re: git: aa70361d863b - main - headers: make a few more headers self-contained To: Kristof Provost Cc: src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000019041005d4aedd6b" X-Rspamd-Queue-Id: 4JSJwv18d7z3wBk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --00000000000019041005d4aedd6b Content-Type: text/plain; charset="UTF-8" On Mon, Jan 3, 2022 at 5:56 AM Kristof Provost wrote: > The branch main has been updated by kp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=aa70361d863b7ec20c7e72a6fa7de8fb110715e1 > > commit aa70361d863b7ec20c7e72a6fa7de8fb110715e1 > Author: Kristof Provost > AuthorDate: 2021-12-24 15:43:57 +0000 > Commit: Kristof Provost > CommitDate: 2022-01-03 09:12:30 +0000 > > headers: make a few more headers self-contained > > Sponsored by: Rubicon Communications, LLC ("Netgate") > --- > sys/netinet/ip_var.h | 5 ++++- > sys/netinet/udp.h | 2 ++ > sys/netinet/udp_var.h | 5 +++++ > sys/sys/epoch.h | 2 ++ > tools/build/test-includes/badfiles.inc | 4 ---- > 5 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h > index 77b6ee88507a..d5c68442a2b9 100644 > --- a/sys/netinet/ip_var.h > +++ b/sys/netinet/ip_var.h > @@ -35,8 +35,11 @@ > #ifndef _NETINET_IP_VAR_H_ > #define _NETINET_IP_VAR_H_ > > -#include > #include > +#include > +#include > + > +#include > > /* > * Overlay for ip header used by other protocols (tcp, udp). > diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h > index 263a64fbe588..d7def4e41fc8 100644 > --- a/sys/netinet/udp.h > +++ b/sys/netinet/udp.h > @@ -36,6 +36,8 @@ > #ifndef _NETINET_UDP_H_ > #define _NETINET_UDP_H_ > > +#include > + > /* > * UDP protocol header. > * Per RFC 768, September, 1981. > diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h > index 9a15016b37e3..e66328ec5cb0 100644 > --- a/sys/netinet/udp_var.h > +++ b/sys/netinet/udp_var.h > @@ -36,6 +36,11 @@ > #ifndef _NETINET_UDP_VAR_H_ > #define _NETINET_UDP_VAR_H_ > > +#include > types.h isn't needed here because both udp.h and ip_var.h include it. > +#include > +#include > + > /* > * UDP kernel structures and variables. > */ > diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h > index 6ce0fcd01c60..7b06ee19c2f3 100644 > --- a/sys/sys/epoch.h > +++ b/sys/sys/epoch.h > @@ -30,6 +30,8 @@ > #ifndef _SYS_EPOCH_H_ > #define _SYS_EPOCH_H_ > > +#include > + > struct epoch_context { > void *data[2]; > } __aligned(sizeof(void *)); > diff --git a/tools/build/test-includes/badfiles.inc > b/tools/build/test-includes/badfiles.inc > index 70061ae0b2b2..ce70cca62959 100644 > --- a/tools/build/test-includes/badfiles.inc > +++ b/tools/build/test-includes/badfiles.inc > @@ -35,7 +35,6 @@ BADHDRS= \ > sys/elf64.h \ > sys/elf_common.h \ > sys/elf_generic.h \ > - sys/epoch.h \ > sys/eui64.h \ > sys/eventhandler.h \ > sys/eventvar.h \ > @@ -267,7 +266,6 @@ BADHDRS= \ > netinet/ip_icmp.h \ > netinet/ip_mroute.h \ > netinet/ip_options.h \ > - netinet/ip_var.h \ > netinet/pim_var.h \ > netinet/sctp_auth.h \ > netinet/sctp_bsd_addr.h \ > @@ -287,8 +285,6 @@ BADHDRS= \ > netinet/tcp_var.h \ > netinet/tcpip.h \ > netinet/toecore.h \ > - netinet/udp.h \ > - netinet/udp_var.h \ > netinet/udplite.h \ > netinet6/icmp6.h \ > netinet6/in6.h \ > --00000000000019041005d4aedd6b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Jan 3, 2022 at 5:56 AM Kristo= f Provost <kp@freebsd.org> wrot= e:
The branch ma= in has been updated by kp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3Daa70361d863b7ec20c7e72a6fa7de8fb110715e1
commit aa70361d863b7ec20c7e72a6fa7de8fb110715e1
Author:=C2=A0 =C2=A0 =C2=A0Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2021-12-24 15:43:57 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Kristof Provost <kp@FreeBSD.org>
CommitDate: 2022-01-03 09:12:30 +0000

=C2=A0 =C2=A0 headers: make a few more headers self-contained

=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Rubicon Communications, LLC ("= Netgate")
---
=C2=A0sys/netinet/ip_var.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0| 5 ++++-
=C2=A0sys/netinet/udp.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 | 2 ++
=C2=A0sys/netinet/udp_var.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 | 5 +++++
=C2=A0sys/sys/epoch.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 ++
=C2=A0tools/build/test-includes/badfiles.inc | 4 ----
=C2=A05 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 77b6ee88507a..d5c68442a2b9 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -35,8 +35,11 @@
=C2=A0#ifndef _NETINET_IP_VAR_H_
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 _NETINET_IP_VAR_H_

-#include <sys/queue.h>
=C2=A0#include <sys/epoch.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+
+#include <netinet/in.h>

=C2=A0/*
=C2=A0 * Overlay for ip header used by other protocols (tcp, udp).
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 263a64fbe588..d7def4e41fc8 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -36,6 +36,8 @@
=C2=A0#ifndef _NETINET_UDP_H_
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 _NETINET_UDP_H_

+#include <sys/types.h>
+
=C2=A0/*
=C2=A0 * UDP protocol header.
=C2=A0 * Per RFC 768, September, 1981.
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 9a15016b37e3..e66328ec5cb0 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -36,6 +36,11 @@
=C2=A0#ifndef _NETINET_UDP_VAR_H_
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 _NETINET_UDP_VAR_H_

+#include <sys/types.h>

types.h i= sn't needed here because both udp.h and ip_var.h include it.
= =C2=A0
+#include <netinet/ip_var.h>
+#include <netinet/udp.h>
+
=C2=A0/*
=C2=A0 * UDP kernel structures and variables.
=C2=A0 */
diff --git a/sys/sys/epoch.h b/sys/sys/epoch.h
index 6ce0fcd01c60..7b06ee19c2f3 100644
--- a/sys/sys/epoch.h
+++ b/sys/sys/epoch.h
@@ -30,6 +30,8 @@
=C2=A0#ifndef _SYS_EPOCH_H_
=C2=A0#define _SYS_EPOCH_H_

+#include <sys/cdefs.h>
+
=C2=A0struct epoch_context {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 void=C2=A0 =C2=A0*data[2];
=C2=A0} __aligned(sizeof(void *));
diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-incl= udes/badfiles.inc
index 70061ae0b2b2..ce70cca62959 100644
--- a/tools/build/test-includes/badfiles.inc
+++ b/tools/build/test-includes/badfiles.inc
@@ -35,7 +35,6 @@ BADHDRS=3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/elf64.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/elf_common.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/elf_generic.h \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0sys/epoch.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/eui64.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/eventhandler.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/eventvar.h \
@@ -267,7 +266,6 @@ BADHDRS=3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/ip_icmp.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/ip_mroute.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/ip_options.h \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0netinet/ip_var.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/pim_var.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/sctp_auth.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/sctp_bsd_addr.h \
@@ -287,8 +285,6 @@ BADHDRS=3D \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/tcp_var.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/tcpip.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/toecore.h \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0netinet/udp.h \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0netinet/udp_var.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet/udplite.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet6/icmp6.h \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 netinet6/in6.h \
--00000000000019041005d4aedd6b--