Module Name: src
Committed By: thorpej
Date: Sat Sep 3 20:29:31 UTC 2022
Modified Files:
src/sys/net: if_mpls.c
src/sys/rump/net/lib/libnetmpls: Makefile Makefile.inc
Log Message:
Machete-waving to fix mpls rump build after pktqueue changes.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/net/if_mpls.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/net/lib/libnetmpls/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetmpls/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.40 src/sys/net/if_mpls.c:1.41
--- src/sys/net/if_mpls.c:1.40 Sat Sep 3 02:47:59 2022
+++ src/sys/net/if_mpls.c Sat Sep 3 20:29:31 2022
@@ -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_rfc4182;
static u_int mpls_count;
+
+void mplsattach(int);
+
/* ARGSUSED */
void
mplsattach(int count)
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.5 src/sys/rump/net/lib/libnetmpls/Makefile:1.6
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.5 Mon Oct 19 16:16:38 2015
+++ src/sys/rump/net/lib/libnetmpls/Makefile Sat Sep 3 20:29:30 2022
@@ -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>
Index: src/sys/rump/net/lib/libnetmpls/Makefile.inc
diff -u src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.2 src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.3
--- src/sys/rump/net/lib/libnetmpls/Makefile.inc:1.2 Tue Mar 18 18:20:44 2014
+++ src/sys/rump/net/lib/libnetmpls/Makefile.inc Sat Sep 3 20:29:30 2022
@@ -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
