summaryrefslogtreecommitdiff
path: root/sys/net/if_ethersubr.c
diff options
context:
space:
mode:
authordenis <denis@cvs.openbsd.org>2018-01-03 19:39:37 +0000
committerdenis <denis@cvs.openbsd.org>2018-01-03 19:39:37 +0000
commit86c4671abcf67dbb66258b99a58308027959a94c (patch)
treee8fde4105c80c505e729dbe0af0c1c72f435c0c0 /sys/net/if_ethersubr.c
parent6fe864ce27e08fff824a34466fc9f13a5b51b927 (diff)
Add support for IPv6 over MPLS pseudowire aka mpw(4)
OK claudio@ jca@
Diffstat (limited to 'sys/net/if_ethersubr.c')
-rw-r--r--sys/net/if_ethersubr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 8041fd2ae1a..f0dadddfbfc 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.246 2017/05/31 05:59:09 mpi Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.247 2018/01/03 19:39:36 denis Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -248,6 +248,11 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
memcpy(edst, LLADDR(satosdl(dst)),
sizeof(edst));
break;
+ case AF_INET6:
+ error = nd6_resolve(ifp, rt, m, dst, edst);
+ if (error)
+ return (error == EAGAIN ? 0 : error);
+ break;
case AF_INET:
case AF_MPLS:
error = arpresolve(ifp, rt, m, dst, edst);