MPLS also needs a definition for etherip_output(), fix build without

bridge.

diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 61995b7..59a6cff 100644 (file)
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in_gif.c,v 1.43 2015/03/14 03:38:51 jsg Exp $ */
+/*     $OpenBSD: in_gif.c,v 1.44 2015/05/12 12:27:17 mpi Exp $ */
 /*     $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */
 
 /*
@@ -50,7 +50,7 @@
 
 #include "gif.h"
 #include "bridge.h"
-#if NBRIDGE > 0
+#if NBRIDGE > 0 || defined(MPLS)
 #include <netinet/ip_ether.h>
 #endif
 

diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index cbbe81b..c5bfed0 100644 (file)
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: in6_gif.c,v 1.37 2015/03/14 03:38:52 jsg Exp $        */
+/*     $OpenBSD: in6_gif.c,v 1.38 2015/05/12 12:27:17 mpi Exp $        */
 /*     $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $        */
 
 /*
@@ -60,7 +60,7 @@
 #include <net/if_gif.h>
 
 #include "bridge.h"
-#if NBRIDGE > 0
+#if NBRIDGE > 0 || defined(MPLS)
 #include <netinet/ip_ether.h>
 #endif