[src/trunk]: src/sys Machete-waving to fix mpls rump build after pktqueue cha...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40fed467e22b
branches:  trunk
changeset: 369847:40fed467e22b
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Sep 03 20:29:30 2022 +0000

description:
Machete-waving to fix mpls rump build after pktqueue changes.

diffstat:

 sys/net/if_mpls.c                        |  7 +++++--
 sys/rump/net/lib/libnetmpls/Makefile     |  5 ++---
 sys/rump/net/lib/libnetmpls/Makefile.inc |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r d7b643e61b95 -r 40fed467e22b sys/net/if_mpls.c
--- a/sys/net/if_mpls.c Sat Sep 03 15:03:32 2022 +0000
+++ b/sys/net/if_mpls.c Sat Sep 03 20:29:30 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $ */
+/*     $NetBSD: if_mpls.c,v 1.41 2022/09/03 20:29:31 thorpej Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.40 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.41 2022/09/03 20:29:31 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -104,6 +104,9 @@
     mpls_rfc4182;
 
 static u_int mpls_count;
+
+void   mplsattach(int);
+
 /* ARGSUSED */
 void
 mplsattach(int count)
diff -r d7b643e61b95 -r 40fed467e22b sys/rump/net/lib/libnetmpls/Makefile
--- a/sys/rump/net/lib/libnetmpls/Makefile      Sat Sep 03 15:03:32 2022 +0000
+++ b/sys/rump/net/lib/libnetmpls/Makefile      Sat Sep 03 20:29:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/10/19 16:16:38 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2022/09/03 20:29:30 thorpej Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
@@ -7,8 +7,7 @@
 COMMENT=Multiprotocol Label Switching (PF_MPLS)
 
 IOCONF=        NETMPLS.ioconf
-SRCS=  mpls_ttl.c if_mpls.c
-SRCS+= netmpls_component.c
+SRCS=  netmpls_component.c
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r d7b643e61b95 -r 40fed467e22b sys/rump/net/lib/libnetmpls/Makefile.inc
--- a/sys/rump/net/lib/libnetmpls/Makefile.inc  Sat Sep 03 15:03:32 2022 +0000
+++ b/sys/rump/net/lib/libnetmpls/Makefile.inc  Sat Sep 03 20:29:30 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/03/18 18:20:44 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.3 2022/09/03 20:29:30 thorpej Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../netmpls
 
-SRCS+= mpls_proto.c
+SRCS+= mpls_ttl.c if_mpls.c mpls_proto.c