From ab1396393ab4730fcecf70130b273bd12bf7bc3c Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Tue, 12 May 2015 12:27:17 +0000
Subject: [PATCH] MPLS also needs a definition for etherip_output(), fix build
 without bridge.

---
 sys/netinet/in_gif.c   | 4 ++--
 sys/netinet6/in6_gif.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 61995b73206..59a6cff70fb 100644
--- 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 cbbe81b83e0..c5bfed0ca88 100644
--- 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
 
-- 
2.20.1