From nobody Fri Sep 18 22:42:59 2026 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 4hmnhM4JnWz6t51y for ; Fri, 18 Sep 2026 22:42:59 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmnhM22Hgz55N5 for ; Fri, 18 Sep 2026 22:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789771379; 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=fEYv7+EeB04dAryyg08JRzu2Gju9jdS2ioeq2FUbwQ0=; b=Yhz/U8J+pTxl9iQQrvfWil2nNB1BY221q2pn+jwNuHKQA1bJjZZxVBE/xRL67rj9fZU+/c rKeHEnzoeQ0XM1pOpAqAx9W+5AjCWax3ZAWbBB0tLocEsmE7iUueiysNWkpMjfCY3kayPK KmZjfeErq5k4igcnDpdVNB3OAiLPitXe2T2szUt2HfpKkSI2WngQBQQZrwNQD1izIQj3Ys pjHM4lR66Puq4Pt1cNQSwB/KPzjGaaFDCPwQ588bTrvjwgTExrJ0mdIOOL3YPVle1A0vmS lFaH/0dkDvpqrp/xCKki5z06urtS+kXVOrpT25mZz59MgEd9fc+JVM9mPMSZVA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789771379; b=HBiuFaV0j8040JyqkJNsdnA4BO7cKLgSk1rIqaz89SvvkeCrl7kpNp27man0VtbeZHLN0i gYQ76E4e2duaHZ/vEUs/FqaHNtg7+/uBBOvNL3nowiuu10T3OjNARcIQLnDrl3JA/MwAJy BTub9XsBX/K2oRFrtMdCJ29FZeI5duZNnqKbfHk2biwFIitH7u3Y058r0bKWjP4M38Nugq Fzs926MXq0aI2Y5wHS0RFrthHq9nEDDol7ss9nEXolU+a3NU92yG4/pJx/zLSisduN7fKA Q/kQa2VRmL3Zc4m8ILRfOrp7pYpi8MlrLPOXcWafqRZIbNjkRTIJbco+o3lbjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789771379; 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=fEYv7+EeB04dAryyg08JRzu2Gju9jdS2ioeq2FUbwQ0=; b=uPJYBk/OdxhsXd5n+VXlEjF0ttauAnRphqmykGgljfz+JVVzAWKrPzmktwLyLAa9iwlaDF OiUavs3KXEitoQaAyfWRWWgacpcdKANsAN1GMRLk6tXs3kuZoLdpTvpX7FT/W/a9kDF6fr v0qqD1hqQCFNBJ2Ucreo5Dr5zYNmtnBgoF0DHnGSK0svdNeRUos8+k/0O0xnWWXbIVAMEk m0lXYwm7Aup9kMWh2xY1OayYDANkE5NrgzVF3b699JmJG2oAWBYFd4BLCyTXgEagWH0g/J 4Qi//Nhkp5GnF5Wsjvv5tEkTPNJjKX2BHUZxnj2Op9QjFk/XqkJmQBTh9H2GCw== 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 4hmnhM16jfzg51 for ; Fri, 18 Sep 2026 22:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2313e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 22:42:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8aab44ce3b6a - main - netinet6?: move struct ip6?_moptions definition to in6?_var.h 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aab44ce3b6a538d63b10c65f67c57b720ce01f7 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 22:42:59 +0000 Message-Id: <6aadbe73.2313e.2e9db41@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8aab44ce3b6a538d63b10c65f67c57b720ce01f7 commit 8aab44ce3b6a538d63b10c65f67c57b720ce01f7 Author: Gleb Smirnoff AuthorDate: 2026-09-18 22:06:01 +0000 Commit: Gleb Smirnoff CommitDate: 2026-09-18 22:42:41 +0000 netinet6?: move struct ip6?_moptions definition to in6?_var.h Rest of multicast related kernel structures live in in6?_var.h and this piece of ip6?_var.h was anyway requiring in6?_var.h to be included before. Differential Revision: https://reviews.freebsd.org/D55963 --- sys/netinet/in_var.h | 14 +++++++++++--- sys/netinet/ip_var.h | 19 +------------------ sys/netinet6/in6_var.h | 12 +++++++++--- sys/netinet6/ip6_var.h | 16 +--------------- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index e9db1efd9fe9..a0ef2f4d65b0 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -209,9 +209,18 @@ struct in_mfilter { }; /* - * Helper types and functions for IPv4 multicast filters. + * Structure attached to inpcb.ip_moptions and passed to ip_output() when IP + * multicast options are in use. + * This structure is lazy-allocated. */ -STAILQ_HEAD(ip_mfilter_head, in_mfilter); +struct ip_moptions { + struct ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */ + struct in_addr imo_multicast_addr; /* ifindex/addr on MULTICAST_IF */ + u_long imo_multicast_vif; /* vif num outgoing multicasts */ + u_char imo_multicast_ttl; /* TTL for outgoing multicasts */ + u_char imo_multicast_loop; /* 1 => hear sends if a member */ + STAILQ_HEAD(ip_mfilter_head, in_mfilter) imo_head; +}; struct in_mfilter *ip_mfilter_alloc(int mflags, int st0, int st1); void ip_mfilter_free(struct in_mfilter *); @@ -419,7 +428,6 @@ inm_rele_locked(struct in_multi_head *inmh, struct in_multi *inm) #define MCAST_MUTED 3 /* [deprecated] */ struct rib_head; -struct ip_moptions; struct ucred; struct in_multi *inm_lookup_locked(struct ifnet *, const struct in_addr); diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 081938ec7ae4..3a6c3eb51151 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -82,24 +82,6 @@ struct ipoption { char ipopt_list[MAX_IPOPTLEN]; /* options proper */ }; -#if defined(_NETINET_IN_VAR_H_) && defined(_KERNEL) -/* - * Structure attached to inpcb.ip_moptions and - * passed to ip_output when IP multicast options are in use. - * This structure is lazy-allocated. - */ -struct ip_moptions { - struct ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */ - struct in_addr imo_multicast_addr; /* ifindex/addr on MULTICAST_IF */ - u_long imo_multicast_vif; /* vif num outgoing multicasts */ - u_char imo_multicast_ttl; /* TTL for outgoing multicasts */ - u_char imo_multicast_loop; /* 1 => hear sends if a member */ - struct ip_mfilter_head imo_head; /* group membership list */ -}; -#else -struct ip_moptions; -#endif - struct ipstat { uint64_t ips_total; /* total packets received */ uint64_t ips_badsum; /* checksum bad */ @@ -191,6 +173,7 @@ struct inpcb; struct route; struct sockopt; struct inpcbinfo; +struct ip_moptions; VNET_DECLARE(int, ip_defttl); /* default IP ttl */ VNET_DECLARE(int, ipforwarding); /* ip forwarding */ diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 655787c9ba53..7c8639841741 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -635,9 +635,16 @@ struct in6_mfilter { }; /* - * Helper types and functions for IPv4 multicast filters. + * Structure attached to inpcb.in6p_moptions and passed to ip6_output() when + * IPv6 multicast options are in use. + * This structure is lazy-allocated. */ -STAILQ_HEAD(ip6_mfilter_head, in6_mfilter); +struct ip6_moptions { + struct ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */ + u_char im6o_multicast_hlim; /* hoplimit for outgoing multicasts */ + u_char im6o_multicast_loop; /* 1 >= hear sends if a member */ + STAILQ_HEAD(ip6_mfilter_head, in6_mfilter) im6o_head; +}; struct in6_mfilter *ip6_mfilter_alloc(int mflags, int st0, int st1); void ip6_mfilter_free(struct in6_mfilter *); @@ -860,7 +867,6 @@ in6m_rele_locked(struct in6_multi_head *inmh, struct in6_multi *inm) } } -struct ip6_moptions; struct sockopt; struct inpcbinfo; struct rib_head; diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 769a254cdf52..f96847ddc30f 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -113,21 +113,6 @@ struct ip6_direct_ctx { uint32_t ip6dc_off; /* offset to next header */ }; -#if defined(_NETINET6_IN6_VAR_H_) && defined(_KERNEL) -/* - * Structure attached to inpcb.in6p_moptions and - * passed to ip6_output when IPv6 multicast options are in use. - * This structure is lazy-allocated. - */ -struct ip6_moptions { - struct ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */ - u_char im6o_multicast_hlim; /* hoplimit for outgoing multicasts */ - u_char im6o_multicast_loop; /* 1 >= hear sends if a member */ - struct ip6_mfilter_head im6o_head; /* group membership list */ -}; -#else -struct ip6_moptions; -#endif /* * Control options for outgoing packets */ @@ -395,6 +380,7 @@ struct inpcb; struct socket; struct sockopt; struct ucred; +struct ip6_moptions; int icmp6_ctloutput(struct socket *, struct sockopt *sopt);