git: 0e0455aaa799 - stable/14 - ip6_mroute: Mark functions as static
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Feb 2026 19:47:27 UTC
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=0e0455aaa799a27bd359468cb32b6a390aebb144
commit 0e0455aaa799a27bd359468cb32b6a390aebb144
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-01-30 15:25:52 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-02-16 16:09:28 +0000
ip6_mroute: Mark functions as static
No functional change intended.
MFC after: 2 weeks
Sponsored by: Stormshield
Sponsored by: Klara, Inc.
(cherry picked from commit a03eabfebbce15d8ce028168969812d3ca2be206)
(cherry picked from commit ebc9a98c1b7d0a47359dae34509e1d9c02767a88)
---
sys/netinet6/ip6_mroute.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 9d30c1291b7b..9e41dd8176d3 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -362,16 +362,16 @@ static int get_sg_cnt(struct sioc_sg_req6 *);
static struct callout expire_upcalls_ch;
-int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
-int X_ip6_mrouter_done(void);
-int X_ip6_mrouter_set(struct socket *, struct sockopt *);
-int X_ip6_mrouter_get(struct socket *, struct sockopt *);
-int X_mrt6_ioctl(u_long, caddr_t);
+static int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *);
+static int X_ip6_mrouter_done(void);
+static int X_ip6_mrouter_set(struct socket *, struct sockopt *);
+static int X_ip6_mrouter_get(struct socket *, struct sockopt *);
+static int X_mrt6_ioctl(u_long, caddr_t);
/*
* Handle MRT setsockopt commands to modify the multicast routing tables.
*/
-int
+static int
X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt)
{
int error = 0;
@@ -439,7 +439,7 @@ X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt)
/*
* Handle MRT getsockopt commands
*/
-int
+static int
X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt)
{
int error = 0;
@@ -458,7 +458,7 @@ X_ip6_mrouter_get(struct socket *so, struct sockopt *sopt)
/*
* Handle ioctl commands to obtain information from the cache
*/
-int
+static int
X_mrt6_ioctl(u_long cmd, caddr_t data)
{
int ret;
@@ -588,7 +588,7 @@ ip6_mrouter_init(struct socket *so, int v, int cmd)
/*
* Disable IPv6 multicast forwarding.
*/
-int
+static int
X_ip6_mrouter_done(void)
{
mifi_t mifi;
@@ -1058,7 +1058,7 @@ socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in6 *src)
* that if this function is called from somewhere else in the originating
* context in the future.
*/
-int
+static int
X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m)
{
struct rtdetq *rte;