From 63f0d21cf2476e1e881ab1de3b527f058bff3be2 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 3 Sep 2022 20:29:30 +0000
Subject: [PATCH] Machete-waving to fix mpls rump build after pktqueue changes.

---
 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(-)

diff --git a/sys/net/if_mpls.c b/sys/net/if_mpls.c
index 2dda60ca927e..729fe89ec7aa 100644
--- a/sys/net/if_mpls.c
+++ b/sys/net/if_mpls.c
@@ -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 @@ extern int mpls_defttl, mpls_mapttl_inet, mpls_mapttl_inet6, mpls_icmp_respond,
     mpls_rfc4182;
 
 static u_int mpls_count;
+
+void	mplsattach(int);
+
 /* ARGSUSED */
 void
 mplsattach(int count)
diff --git a/sys/rump/net/lib/libnetmpls/Makefile b/sys/rump/net/lib/libnetmpls/Makefile
index 14cb55a05ece..f76f1b183386 100644
--- a/sys/rump/net/lib/libnetmpls/Makefile
+++ b/sys/rump/net/lib/libnetmpls/Makefile
@@ -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 @@ LIB=	rumpnet_netmpls
 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 --git a/sys/rump/net/lib/libnetmpls/Makefile.inc b/sys/rump/net/lib/libnetmpls/Makefile.inc
index b444d7bb0466..102bd6298277 100644
--- a/sys/rump/net/lib/libnetmpls/Makefile.inc
+++ b/sys/rump/net/lib/libnetmpls/Makefile.inc
@@ -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