diff options
| -rw-r--r-- | sys/netmpls/mpls.h | 5 | ||||
| -rw-r--r-- | sys/netmpls/mpls_input.c | 3 | ||||
| -rw-r--r-- | sys/netmpls/mpls_output.c | 4 | ||||
| -rw-r--r-- | sys/netmpls/mpls_proto.c | 5 |
4 files changed, 7 insertions, 10 deletions
diff --git a/sys/netmpls/mpls.h b/sys/netmpls/mpls.h index a167b1f3399..2903aa4ca26 100644 --- a/sys/netmpls/mpls.h +++ b/sys/netmpls/mpls.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls.h,v 1.27 2013/03/27 02:00:08 tedu Exp $ */ +/* $OpenBSD: mpls.h,v 1.28 2013/04/24 10:20:15 mpi Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -144,6 +144,8 @@ struct rt_mpls { #ifdef _KERNEL +extern struct domain mplsdomain; + struct mpe_softc { struct ifnet sc_if; /* the interface */ int sc_unit; @@ -168,6 +170,7 @@ extern struct ifqueue mplsintrq; /* MPLS input queue */ extern int mpls_defttl; extern int mpls_mapttl_ip; extern int mpls_mapttl_ip6; +extern int mpls_inkloop; void mpls_init(void); diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index de1a2242278..9d3a5fa2a2e 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.33 2013/03/26 13:19:26 mpi Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.34 2013/04/24 10:20:15 mpi Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -47,7 +47,6 @@ #include <netmpls/mpls.h> struct ifqueue mplsintrq; -extern int mpls_inkloop; #ifdef MPLS_DEBUG #define MPLS_LABEL_GET(l) ((ntohl((l) & MPLS_LABEL_MASK)) >> MPLS_LABEL_OFFSET) diff --git a/sys/netmpls/mpls_output.c b/sys/netmpls/mpls_output.c index 3a18614be7c..21d90d48134 100644 --- a/sys/netmpls/mpls_output.c +++ b/sys/netmpls/mpls_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_output.c,v 1.15 2011/04/04 17:44:43 henning Exp $ */ +/* $OpenBSD: mpls_output.c,v 1.16 2013/04/24 10:20:15 mpi Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -37,8 +37,6 @@ #include <netinet/ip6.h> #endif -extern int mpls_inkloop; - #ifdef MPLS_DEBUG #define MPLS_LABEL_GET(l) ((ntohl((l) & MPLS_LABEL_MASK)) >> MPLS_LABEL_OFFSET) #endif diff --git a/sys/netmpls/mpls_proto.c b/sys/netmpls/mpls_proto.c index 7d7868a22bc..b1266119286 100644 --- a/sys/netmpls/mpls_proto.c +++ b/sys/netmpls/mpls_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_proto.c,v 1.6 2011/03/31 10:36:42 jasper Exp $ */ +/* $OpenBSD: mpls_proto.c,v 1.7 2013/04/24 10:20:15 mpi Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -44,9 +44,6 @@ /* * MPLS protocol family: */ - -extern struct domain mplsdomain; - struct protosw mplssw[] = { { 0, &mplsdomain, 0, 0, 0, 0, 0, 0, |