From nobody Fri Sep 05 19:09:17 2025 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 4cJQrF4tHhz66G2t; Fri, 05 Sep 2025 19:09:17 +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 4cJQrF3ylyz3Qnq; Fri, 05 Sep 2025 19:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099357; 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=yrDGIoeKJGrPSrwp/qWn9Y1QRa4LPmkMkWZNiL5iLUY=; b=Bk1AB7zJxKv02NXCH6lWue0I47wPSd/lZPfTzFeVKjoZpI4dGoQPT9EaSAhQZRCSKdL5ws qr5vldJDPx/R6mRZj5vgSFbJMiA0cNTYQjClZV5Eq19VzKZfStY6dfM1FsuNm5Ymeb3prq o5zzK8oYoY7dD8XGSvpRbW6eGPryLdDfIYDjXzWLb/HurDjsYTB+phliszHbI9nRAJG+k7 NUCB5SN7IA+CDGHhYoDZvCWQwTV+ZH4UPf5dlg1SkFyFZghsT1EIiVwuTrNRtxcVnARXjC gw0edCPtTqF2S++/fKvUku1tMxot3Yzluah/fY2p21BDo/lGtSyCVVHzhl+SSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099357; 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=yrDGIoeKJGrPSrwp/qWn9Y1QRa4LPmkMkWZNiL5iLUY=; b=d5H2iu/bbyXuCjaUu7He4ZpHhJPwq9rurcsr+zJh8a4T6D0HBbnoEtiua9EH7NsY0STmSd x8hbs8HI/k/DBCW06dWVLMAvXpP/NCSxDCJlFVwTyVKgCCg2aJSmhg8jytIKiwvdBCJ1+/ Kqm802+Zmi9v+gOU858+ucMurcMd/Yk46tNLsMJMT6yV8EZEsEphKkhwF1eJrbfTkIe282 F1rsh3nCFzYB5NIa8AxMQBxnBqI3mQV878IZGxcZnmmMRSjLsgvGUwEn9lzTSfF3mGBENX I8bqdBBVdRVM+S8GULJhKNIfljlb7c9n2MD/5x0Oa37glTz8CqEZ7Ul7qi6EnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099357; a=rsa-sha256; cv=none; b=JwuToiZo77cw4JpiocABcwzIrBevSayioSYH7YVhQe4jxZ4UE04P4Tk+v91Z47+o+6E8Kz hHSy0uwzeoU3HfQLYsewsLdBsTfnFZk2SBgFZ7plvrXTOoKmCNNVTl8mWk2mzEtJaR3BwH 9fL1HFnR54bFAwyM5mdDRyHCKCWtZoA9flxgmKP2tkfoP/5G8OGeWQlYutw9p8vhHbhK4M kPiChb20HRYp0uuVszonGpOOWEv6aGd7WCPh6JhAtA9JRQQF7WQ2kOsj3kuBe6+3ZQt7lR auND8H+lqGlt+H+puvmrKZT77n6IVJJyrWHEcivBtFzwwgYuPxTxi29hUZLq6w== 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 4cJQrF3Bzzz11gD; Fri, 05 Sep 2025 19:09:17 +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 585J9HMk038823; Fri, 5 Sep 2025 19:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J9HR2038820; Fri, 5 Sep 2025 19:09:17 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:09:17 GMT Message-Id: <202509051909.585J9HR2038820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 25c0c8725fbb - stable/14 - vtnet, ptnet: include opt_*.h files early 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25c0c8725fbb1713543429709077cbb78bac0c51 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=25c0c8725fbb1713543429709077cbb78bac0c51 commit 25c0c8725fbb1713543429709077cbb78bac0c51 Author: Michael Tuexen AuthorDate: 2025-08-21 15:18:07 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:08:47 +0000 vtnet, ptnet: include opt_*.h files early Include opt_inet.h and opt_inet6.h early in the files including virtio_net.h, since they use INET and/or INET6. While there, remove redundant inclusion of sys/types.h, since it is included already by sys/param.h. There was a discussion to include opt_inet.h and opt_inet6.h also in virtio_net.h. glebius suggested to add a mechanism for files to check, if required opt_*.h files were included. virtio_net.h will be the first consumer of this mechanism. Reviewed by: glebius, Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52046 (cherry picked from commit 3077532b1bb2911d3012ee90bae9d9499c960569) --- sys/dev/netmap/if_ptnet.c | 6 ++---- sys/dev/virtio/network/if_vtnet.c | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c index cea62517b2e6..d8995be7f1e9 100644 --- a/sys/dev/netmap/if_ptnet.c +++ b/sys/dev/netmap/if_ptnet.c @@ -27,8 +27,9 @@ /* Driver for ptnet paravirtualized network device. */ #include +#include "opt_inet.h" +#include "opt_inet6.h" -#include #include #include #include @@ -75,9 +76,6 @@ #include #include -#include "opt_inet.h" -#include "opt_inet6.h" - #include #include #include diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 479c34b4f2ee..bc31957d492c 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -29,6 +29,9 @@ /* Driver for VirtIO network devices. */ #include +#include "opt_inet.h" +#include "opt_inet6.h" + #include #include #include @@ -83,9 +86,6 @@ #include #include "virtio_if.h" -#include "opt_inet.h" -#include "opt_inet6.h" - #if defined(INET) || defined(INET6) #include #endif