summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenno <benno@openbsd.org>2019-01-04 11:13:35 +0000
committerbenno <benno@openbsd.org>2019-01-04 11:13:35 +0000
commit932de0d715eec392190a2af5d6ca8ff244e283eb (patch)
tree3ce8c1e18cc11ae847f3f0a462c4146a809350b1
parentMake gas ignore the ".set hardfloat" directive on mips64. (diff)
downloadwireguard-openbsd-932de0d715eec392190a2af5d6ca8ff244e283eb.tar.xz
wireguard-openbsd-932de0d715eec392190a2af5d6ca8ff244e283eb.zip
make kernel build without INET6 again.
ok dlg@
-rw-r--r--sys/net/if_gre.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index c8472556194..5b531cd5cf6 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.143 2018/12/17 23:42:47 dlg Exp $ */
+/* $OpenBSD: if_gre.c,v 1.144 2019/01/04 11:13:35 benno Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -297,9 +297,11 @@ static int gre_input_key(struct mbuf **, int *, int, int, uint8_t,
static struct mbuf *
gre_ipv4_patch(const struct gre_tunnel *, struct mbuf *,
uint8_t);
+#ifdef INET6
static struct mbuf *
gre_ipv6_patch(const struct gre_tunnel *, struct mbuf *,
uint8_t);
+#endif
static struct mbuf *
gre_mpls_patch(const struct gre_tunnel *, struct mbuf *,
uint8_t);
@@ -1205,6 +1207,7 @@ gre_ipv4_patch(const struct gre_tunnel *tunnel, struct mbuf *m, uint8_t otos)
return (m);
}
+#ifdef INET6
static struct mbuf *
gre_ipv6_patch(const struct gre_tunnel *tunnel, struct mbuf *m, uint8_t otos)
{
@@ -1231,6 +1234,7 @@ gre_ipv6_patch(const struct gre_tunnel *tunnel, struct mbuf *m, uint8_t otos)
return (m);
}
+#endif
static struct mbuf *
gre_mpls_patch(const struct gre_tunnel *tunnel, struct mbuf *m, uint8_t otos)