The branch stable/14 has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=21fe380f2d83fdbbebd3a97aff801476e24e4a16

commit 21fe380f2d83fdbbebd3a97aff801476e24e4a16
Author:     Mark Johnston <[email protected]>
AuthorDate: 2026-02-02 14:57:49 +0000
Commit:     Mark Johnston <[email protected]>
CommitDate: 2026-02-16 16:09:28 +0000

    ip6_mroute: Fix the UPCALL_TIMING build
    
    MFC after:      2 weeks
    Sponsored by:   Stormshield
    Sponsored by:   Klara, Inc.
    
    (cherry picked from commit 5bb953b095461b488b102ab3025f42cd2ef61f9d)
---
 sys/netinet6/ip6_mroute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 2f5b95f715b4..f152014c3421 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -323,7 +323,7 @@ VNET_DEFINE_STATIC(int, pim6);
 #ifdef UPCALL_TIMING
 #define UPCALL_MAX     50
 static u_long upcall_data[UPCALL_MAX + 1];
-static void collate();
+static void collate(struct timeval *);
 #endif /* UPCALL_TIMING */
 
 static int ip6_mrouter_init(struct socket *, int, int);

Reply via email to