From owner-hackers+M68070=david=gwynne.id.au@openbsd.org Mon Sep 14 04:53:55 2015
Delivered-To: david@gwynne.id.au
Received: by 10.27.85.143 with SMTP id l15csp416721wli;
        Sun, 13 Sep 2015 11:53:56 -0700 (PDT)
X-Received: by 10.31.172.23 with SMTP id v23mr9976437vke.47.1442170435967;
        Sun, 13 Sep 2015 11:53:55 -0700 (PDT)
Return-Path: <owner-hackers+M68070=david=gwynne.id.au@openbsd.org>
Received: from shear.ucar.edu (lists.openbsd.org. [192.43.244.163])
        by mx.google.com with ESMTPS id zi5si5150423vdb.49.2015.09.13.11.53.54
        for <david@gwynne.id.au>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Sun, 13 Sep 2015 11:53:55 -0700 (PDT)
Received-SPF: pass (google.com: domain of owner-hackers+M68070=david=gwynne.id.au@openbsd.org designates 192.43.244.163 as permitted sender) client-ip=192.43.244.163;
Authentication-Results: mx.google.com;
       spf=pass (google.com: domain of owner-hackers+M68070=david=gwynne.id.au@openbsd.org designates 192.43.244.163 as permitted sender) smtp.mailfrom=owner-hackers+M68070=david=gwynne.id.au@openbsd.org
Received: from openbsd.org (localhost [127.0.0.1])
	by shear.ucar.edu (8.15.2/8.15.2) with ESMTP id t8DIrl8A021311
	for <david@gwynne.id.au>; Sun, 13 Sep 2015 12:53:53 -0600 (MDT)
Received: from diehard.n-r-g.com (diehard.n-r-g.com [62.48.3.9])
	by shear.ucar.edu (8.15.2/8.15.2) with ESMTPS id t8DIrcN5024674
	(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL)
	for <hackers@openbsd.org>; Sun, 13 Sep 2015 12:53:40 -0600 (MDT)
Received: (qmail 9310 invoked by uid 1001); 13 Sep 2015 18:53:33 -0000
Date: Sun, 13 Sep 2015 20:53:33 +0200
From: Claudio Jeker <claudio@openbsd.org>
To: hackers@openbsd.org
Subject: tun and tap
Message-ID: <20150913185333.GC2124@diehard.n-r-g.com>
Mail-Followup-To: hackers@openbsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.22 (2013-10-16)
List-Help: <mailto:majordomo@openbsd.org?body=help>
List-ID: <hackers.openbsd.org>
List-Owner: <mailto:owner-hackers@openbsd.org>
List-Post: <mailto:hackers@openbsd.org>
List-Subscribe: <mailto:majordomo@openbsd.org?body=sub%20hackers>
List-Unsubscribe: <mailto:majordomo@openbsd.org?body=unsub%20hackers>
X-Loop: hackers@openbsd.org
Precedence: list
Sender: owner-hackers@openbsd.org
Status: RO
Content-Length: 74096
Lines: 2272

Long time ago I implemented tap(4) (as in Layer 2 tunneling) as part of tun(4)
This was done since both share most of the code. Now the trouble with this
is that switching between modes was always problematic since it abused a
lot to reinitialise the interface from Ethernet to Point-to-point.

So here instead is now a full tap(4) interface that is Layer 2 and tun(4)
will now only be layer 3. The code is still all in if_tun.c and
pseudodevice tun but it growed a second cloner.

Diff is not including some of the generated changes (man pages, etc) but
should have all to make it work. Don't forget to install MAKEDEV and run
MAKEDEV all to get the new /dev/tap{0,1,2,3} nodes.

-- 
:wq Claudio

Index: sys/net/if_tun.c
===================================================================
RCS file: /cvs/src/sys/net/if_tun.c,v
retrieving revision 1.155
diff -u -p -r1.155 if_tun.c
--- sys/net/if_tun.c	10 Sep 2015 17:41:15 -0000	1.155
+++ sys/net/if_tun.c	13 Sep 2015 15:05:38 -0000
@@ -79,7 +79,7 @@ struct tun_softc {
 	struct arpcom	arpcom;		/* ethernet common data */
 	struct selinfo	tun_rsel;	/* read select */
 	struct selinfo	tun_wsel;	/* write select (not used) */
-	LIST_ENTRY(tun_softc) tun_list;	/* all tunnel interfaces */
+	LIST_ENTRY(tun_softc) entry;	/* all tunnel interfaces */
 	int		tun_unit;
 	uid_t		tun_siguid;	/* uid for process that set tun_pgid */
 	uid_t		tun_sigeuid;	/* euid for process that set tun_pgid */
@@ -102,31 +102,49 @@ int	tundebug = TUN_DEBUG;
 #define TUN_IFF_FLAGS (IFF_UP|IFF_POINTOPOINT|IFF_MULTICAST|IFF_BROADCAST)
 
 void	tunattach(int);
+
+/* cdev functions */
 int	tunopen(dev_t, int, int, struct proc *);
 int	tunclose(dev_t, int, int, struct proc *);
-int	tun_ioctl(struct ifnet *, u_long, caddr_t);
-int	tun_output(struct ifnet *, struct mbuf *, struct sockaddr *,
-	    struct rtentry *);
 int	tunioctl(dev_t, u_long, caddr_t, int, struct proc *);
 int	tunread(dev_t, struct uio *, int);
 int	tunwrite(dev_t, struct uio *, int);
 int	tunpoll(dev_t, int, struct proc *);
 int	tunkqfilter(dev_t, struct knote *);
+
+int	tapopen(dev_t, int, int, struct proc *);
+int	tapclose(dev_t, int, int, struct proc *);
+int	tapioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int	tapread(dev_t, struct uio *, int);
+int	tapwrite(dev_t, struct uio *, int);
+int	tappoll(dev_t, int, struct proc *);
+int	tapkqfilter(dev_t, struct knote *);
+
+int	tun_dev_open(struct tun_softc *, int, int, struct proc *);
+int	tun_dev_close(struct tun_softc *, int, int, struct proc *);
+int	tun_dev_ioctl(struct tun_softc *, u_long, caddr_t, int, struct proc *);
+int	tun_dev_read(struct tun_softc *, struct uio *, int);
+int	tun_dev_write(struct tun_softc *, struct uio *, int);
+int	tun_dev_poll(struct tun_softc *, int, struct proc *);
+int	tun_dev_kqfilter(struct tun_softc *, struct knote *);
+
+
+int	tun_ioctl(struct ifnet *, u_long, caddr_t);
+int	tun_output(struct ifnet *, struct mbuf *, struct sockaddr *,
+	    struct rtentry *);
 int	tun_clone_create(struct if_clone *, int);
+int	tap_clone_create(struct if_clone *, int);
 int	tun_create(struct if_clone *, int, int);
 int	tun_clone_destroy(struct ifnet *);
-struct	tun_softc *tun_lookup(int);
+static inline struct	tun_softc *tun_lookup(int);
+static inline struct	tun_softc *tap_lookup(int);
 void	tun_wakeup(struct tun_softc *);
-int	tun_switch(struct tun_softc *, int);
-
-void	tun_ifattach(struct ifnet *, int);
-void	tun_ifdetach(struct ifnet *);
-int	tuninit(struct tun_softc *);
+int	tun_init(struct tun_softc *);
+void	tun_start(struct ifnet *);
 int	filt_tunread(struct knote *, long);
 int	filt_tunwrite(struct knote *, long);
 void	filt_tunrdetach(struct knote *);
 void	filt_tunwdetach(struct knote *);
-void	tunstart(struct ifnet *);
 void	tun_link_state(struct tun_softc *);
 
 struct filterops tunread_filtops =
@@ -136,15 +154,21 @@ struct filterops tunwrite_filtops =
 	{ 1, NULL, filt_tunwdetach, filt_tunwrite};
 
 LIST_HEAD(, tun_softc) tun_softc_list;
+LIST_HEAD(, tun_softc) tap_softc_list;
 
 struct if_clone tun_cloner =
     IF_CLONE_INITIALIZER("tun", tun_clone_create, tun_clone_destroy);
 
+struct if_clone tap_cloner =
+    IF_CLONE_INITIALIZER("tap", tap_clone_create, tun_clone_destroy);
+
 void
 tunattach(int n)
 {
 	LIST_INIT(&tun_softc_list);
+	LIST_INIT(&tap_softc_list);
 	if_clone_attach(&tun_cloner);
+	if_clone_attach(&tap_cloner);
 #ifdef PIPEX
 	pipex_init();
 #endif
@@ -156,15 +180,34 @@ tun_clone_create(struct if_clone *ifc, i
 	return (tun_create(ifc, unit, 0));
 }
 
-void
-tun_ifattach(struct ifnet *ifp, int flags)
+int
+tap_clone_create(struct if_clone *ifc, int unit)
 {
-	struct tun_softc	*tp = ifp->if_softc;
+	return (tun_create(ifc, unit, TUN_LAYER2));
+}
+
+int
+tun_create(struct if_clone *ifc, int unit, int flags)
+{
+	struct tun_softc	*tp;
+	struct ifnet		*ifp;
 	int			 s;
 
+	tp = malloc(sizeof(*tp), M_DEVBUF, M_NOWAIT|M_ZERO);
+	if (tp == NULL)
+		return (ENOMEM);
+
+	tp->tun_unit = unit;
+	tp->tun_flags = TUN_INITED|TUN_STAYUP;
+
+	ifp = &tp->tun_if;
+	snprintf(ifp->if_xname, sizeof(ifp->if_xname), "%s%d", ifc->ifc_name,
+	    unit);
+	ifp->if_softc = tp;
+
 	ifp->if_ioctl = tun_ioctl;
 	ifp->if_output = tun_output;
-	ifp->if_start = tunstart;
+	ifp->if_start = tun_start;
 	ifp->if_hardmtu = TUNMRU;
 	ifp->if_link_state = LINK_STATE_DOWN;
 	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
@@ -182,33 +225,41 @@ tun_ifattach(struct ifnet *ifp, int flag
 #if NBPFILTER > 0
 		bpfattach(&ifp->if_bpf, ifp, DLT_LOOP, sizeof(u_int32_t));
 #endif
+		s = splnet();
+		LIST_INSERT_HEAD(&tun_softc_list, tp, entry);
+		splx(s);
 	} else {
 		tp->tun_flags |= TUN_LAYER2;
+		ether_fakeaddr(ifp);
 		ifp->if_flags =
-		    (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST|IFF_LINK0);
+		    (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST);
 		ifp->if_capabilities = IFCAP_VLAN_MTU;
 
 		if_attach(ifp);
 		ether_ifattach(ifp);
+
+		s = splnet();
+		LIST_INSERT_HEAD(&tap_softc_list, tp, entry);
+		splx(s);
 	}
 
-	s = splnet();
-	LIST_INSERT_HEAD(&tun_softc_list, tp, tun_list);
-	splx(s);
 #ifdef PIPEX
-	pipex_iface_init(&tp->pipex_iface, ifp);
+	if ((tp->tun_flags & TUN_LAYER2) == 0)
+		pipex_iface_init(&tp->pipex_iface, ifp);
 #endif
 
+	return (0);
 }
 
-void
-tun_ifdetach(struct ifnet *ifp)
+int
+tun_clone_destroy(struct ifnet *ifp)
 {
 	struct tun_softc	*tp = ifp->if_softc;
 	int			 s;
 
 #ifdef PIPEX
-	pipex_iface_fini(&tp->pipex_iface);
+	if ((tp->tun_flags & TUN_LAYER2) == 0)
+		pipex_iface_fini(&tp->pipex_iface);
 #endif
 	tun_wakeup(tp);
 
@@ -218,117 +269,38 @@ tun_ifdetach(struct ifnet *ifp)
 	splx(s);
 
 	s = splnet();
-	LIST_REMOVE(tp, tun_list);
+	LIST_REMOVE(tp, entry);
 	splx(s);
 
 	if (tp->tun_flags & TUN_LAYER2)
 		ether_ifdetach(ifp);
 
 	if_detach(ifp);
-}
-
-int
-tun_create(struct if_clone *ifc, int unit, int flags)
-{
-	struct tun_softc	*tp;
-	struct ifnet		*ifp;
-
-	tp = malloc(sizeof(*tp), M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (tp == NULL)
-		return (ENOMEM);
-
-	tp->tun_unit = unit;
-	tp->tun_flags = TUN_INITED|TUN_STAYUP;
-
-	ifp = &tp->tun_if;
-	snprintf(ifp->if_xname, sizeof(ifp->if_xname), "%s%d", ifc->ifc_name,
-	    unit);
-	ether_fakeaddr(ifp);
-	ifp->if_softc = tp;
-
-	tun_ifattach(ifp, flags);
-
-	return (0);
-}
-
-int
-tun_clone_destroy(struct ifnet *ifp)
-{
-	struct tun_softc	*tp = ifp->if_softc;
-
-	tun_ifdetach(ifp);
 
 	free(tp, M_DEVBUF, 0);
 	return (0);
 }
 
-struct tun_softc *
+static inline struct tun_softc *
 tun_lookup(int unit)
 {
 	struct tun_softc *tp;
 
-	LIST_FOREACH(tp, &tun_softc_list, tun_list)
+	LIST_FOREACH(tp, &tun_softc_list, entry)
 		if (tp->tun_unit == unit)
 			return (tp);
 	return (NULL);
 }
 
-int
-tun_switch(struct tun_softc *tp, int flags)
+static inline struct tun_softc *
+tap_lookup(int unit)
 {
-	struct ifnet		*ifp = &tp->tun_if;
-	int			 unit, open, s;
-	struct ifg_list		*ifgl;
-	u_int			ifgr_len;
-	char			*ifgrpnames, *p;
-
-	if ((tp->tun_flags & TUN_LAYER2) == (flags & TUN_LAYER2))
-		return (0);
-
-	/* tp will be removed so store unit number */
-	unit = tp->tun_unit;
-	open = tp->tun_flags & (TUN_OPEN|TUN_NBIO|TUN_ASYNC);
-	TUNDEBUG(("%s: switching to layer %d\n", ifp->if_xname,
-		    flags & TUN_LAYER2 ? 2 : 3));
-
-	/* remember joined groups */
-	ifgr_len = 0;
-	ifgrpnames = NULL;
-	TAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next)
-		ifgr_len += IFNAMSIZ;
-	if (ifgr_len)
-		ifgrpnames = malloc(ifgr_len + 1, M_TEMP, M_NOWAIT|M_ZERO);
-	if (ifgrpnames) {
-		p = ifgrpnames;
-		TAILQ_FOREACH(ifgl, &ifp->if_groups, ifgl_next) {
-			strlcpy(p, ifgl->ifgl_group->ifg_group, IFNAMSIZ);
-			p += IFNAMSIZ;
-		}
-	}
-
-	if (ifp->if_flags & IFF_UP)
-		if_down(ifp);
-
-	tun_ifdetach(ifp);
-	tun_ifattach(ifp, flags);
-
-	/* rejoin groups */
-	for (p = ifgrpnames; p && *p; p += IFNAMSIZ)
-		if_addgroup(ifp, p);
-
-	if (open) {
-		/* already opened before ifconfig tunX link0 */
-		s = splnet();
-		tp->tun_flags |= open;
-		ifp->if_flags |= IFF_RUNNING;
-		tun_link_state(tp);
-		splx(s);
-		TUNDEBUG(("%s: already open\n", tp->tun_if.if_xname));
-	}
-	if (ifgrpnames)
-		free(ifgrpnames, M_TEMP, 0);
+	struct tun_softc *tp;
 
-	return (0);
+	LIST_FOREACH(tp, &tap_softc_list, entry)
+		if (tp->tun_unit == unit)
+			return (tp);
+	return (NULL);
 }
 
 /*
@@ -338,9 +310,8 @@ tun_switch(struct tun_softc *tp, int fla
 int
 tunopen(dev_t dev, int flag, int mode, struct proc *p)
 {
-	struct tun_softc	*tp;
-	struct ifnet		*ifp;
-	int			 error, s;
+	struct tun_softc *tp;
+	int error;
 
 	if ((tp = tun_lookup(minor(dev))) == NULL) {	/* create on demand */
 		char	xname[IFNAMSIZ];
@@ -354,6 +325,36 @@ tunopen(dev_t dev, int flag, int mode, s
 		tp->tun_flags &= ~TUN_STAYUP;
 	}
 
+	return (tun_dev_open(tp, flag, mode, p));
+}
+
+int
+tapopen(dev_t dev, int flag, int mode, struct proc *p)
+{
+	struct tun_softc *tp;
+	int error;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL) {	/* create on demand */
+		char	xname[IFNAMSIZ];
+
+		snprintf(xname, sizeof(xname), "%s%d", "tap", minor(dev));
+		if ((error = if_clone_create(xname)) != 0)
+			return (error);
+
+		if ((tp = tap_lookup(minor(dev))) == NULL)
+			return (ENXIO);
+		tp->tun_flags &= ~TUN_STAYUP;
+	}
+
+	return (tun_dev_open(tp, flag, mode, p));
+}
+
+int
+tun_dev_open(struct tun_softc *tp, int flag, int mode, struct proc *p)
+{
+	struct ifnet *ifp;
+	int s;
+
 	if (tp->tun_flags & TUN_OPEN)
 		return (EBUSY);
 
@@ -377,12 +378,28 @@ tunopen(dev_t dev, int flag, int mode, s
 int
 tunclose(dev_t dev, int flag, int mode, struct proc *p)
 {
-	int			 s;
 	struct tun_softc	*tp;
-	struct ifnet		*ifp;
 
 	if ((tp = tun_lookup(minor(dev))) == NULL)
 		return (ENXIO);
+	return (tun_dev_close(tp, flag, mode, p));
+}
+
+int
+tapclose(dev_t dev, int flag, int mode, struct proc *p)
+{
+	struct tun_softc	*tp;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_close(tp, flag, mode, p));
+}
+
+int
+tun_dev_close(struct tun_softc *tp, int flag, int mode, struct proc *p)
+{
+	int			 s;
+	struct ifnet		*ifp;
 
 	ifp = &tp->tun_if;
 	tp->tun_flags &= ~(TUN_OPEN|TUN_NBIO|TUN_ASYNC);
@@ -409,12 +426,12 @@ tunclose(dev_t dev, int flag, int mode, 
 }
 
 int
-tuninit(struct tun_softc *tp)
+tun_init(struct tun_softc *tp)
 {
 	struct ifnet	*ifp = &tp->tun_if;
 	struct ifaddr	*ifa;
 
-	TUNDEBUG(("%s: tuninit\n", ifp->if_xname));
+	TUNDEBUG(("%s: tun_init\n", ifp->if_xname));
 
 	ifp->if_flags |= IFF_UP | IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE; /* we are never active */
@@ -479,7 +496,7 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
 
 	switch (cmd) {
 	case SIOCSIFADDR:
-		tuninit(tp);
+		tun_init(tp);
 		TUNDEBUG(("%s: address set\n", ifp->if_xname));
 		if (tp->tun_flags & TUN_LAYER2) {
 			switch (ifa->ifa_addr->sa_family) {
@@ -494,7 +511,7 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
 		}
 		break;
 	case SIOCSIFDSTADDR:
-		tuninit(tp);
+		tun_init(tp);
 		TUNDEBUG(("%s: destination address set\n", ifp->if_xname));
 		break;
 	case SIOCSIFMTU:
@@ -507,8 +524,6 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
 	case SIOCDELMULTI:
 		break;
 	case SIOCSIFFLAGS:
-		error = tun_switch(tp,
-		    ifp->if_flags & IFF_LINK0 ? TUN_LAYER2 : 0);
 		break;
 	default:
 		if (tp->tun_flags & TUN_LAYER2)
@@ -601,13 +616,30 @@ tun_wakeup(struct tun_softc *tp)
 int
 tunioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
-	int			 s;
-	struct tun_softc	*tp;
-	struct tuninfo		*tunp;
-	struct mbuf		*m;
+	struct tun_softc *tp;
 
 	if ((tp = tun_lookup(minor(dev))) == NULL)
 		return (ENXIO);
+	return (tun_dev_ioctl(tp, cmd, data, flag, p));
+}
+
+int
+tapioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+{
+	struct tun_softc *tp;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_ioctl(tp, cmd, data, flag, p));
+}
+
+int
+tun_dev_ioctl(struct tun_softc *tp, u_long cmd, caddr_t data, int flag,
+    struct proc *p)
+{
+	int			 s;
+	struct tuninfo		*tunp;
+	struct mbuf		*m;
 
 	s = splnet();
 	switch (cmd) {
@@ -698,16 +730,15 @@ tunioctl(dev_t dev, u_long cmd, caddr_t 
 		break;
 	default:
 #ifdef PIPEX
-	    {
-		int ret;
-		ret = pipex_ioctl(&tp->pipex_iface, cmd, data);
-		splx(s);
-		return (ret);
-	    }
-#else
+	    	if (!(tp->tun_flags & TUN_LAYER2)) {
+			int ret;
+			ret = pipex_ioctl(&tp->pipex_iface, cmd, data);
+			splx(s);
+			return (ret);
+		}
+#endif
 		splx(s);
 		return (ENOTTY);
-#endif
 	}
 	splx(s);
 	return (0);
@@ -720,15 +751,31 @@ tunioctl(dev_t dev, u_long cmd, caddr_t 
 int
 tunread(dev_t dev, struct uio *uio, int ioflag)
 {
-	struct tun_softc	*tp;
+	struct tun_softc *tp;
+
+	if ((tp = tun_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_read(tp, uio, ioflag));
+}
+
+int
+tapread(dev_t dev, struct uio *uio, int ioflag)
+{
+	struct tun_softc *tp;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_read(tp, uio, ioflag));
+}
+
+int
+tun_dev_read(struct tun_softc *tp, struct uio *uio, int ioflag)
+{
 	struct ifnet		*ifp;
 	struct mbuf		*m, *m0;
 	int			 error = 0, len, s;
 	unsigned int		ifindex;
 
-	if ((tp = tun_lookup(minor(dev))) == NULL)
-		return (ENXIO);
-
 	ifp = if_ref(&tp->tun_if);
 	ifindex = ifp->if_index;
 	TUNDEBUG(("%s: read\n", ifp->if_xname));
@@ -800,7 +847,26 @@ tunread(dev_t dev, struct uio *uio, int 
 int
 tunwrite(dev_t dev, struct uio *uio, int ioflag)
 {
-	struct tun_softc	*tp;
+	struct tun_softc *tp;
+
+	if ((tp = tun_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_write(tp, uio, ioflag));
+}
+
+int
+tapwrite(dev_t dev, struct uio *uio, int ioflag)
+{
+	struct tun_softc *tp;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_write(tp, uio, ioflag));
+}
+
+int
+tun_dev_write(struct tun_softc *tp, struct uio *uio, int ioflag)
+{
 	struct ifnet		*ifp;
 	struct niqueue		*ifq;
 	u_int32_t		*th;
@@ -809,10 +875,6 @@ tunwrite(dev_t dev, struct uio *uio, int
 #if NBPFILTER > 0
 	int			 s;
 #endif
-
-	if ((tp = tun_lookup(minor(dev))) == NULL)
-		return (ENXIO);
-
 	ifp = &tp->tun_if;
 	TUNDEBUG(("%s: tunwrite\n", ifp->if_xname));
 
@@ -935,13 +997,29 @@ tunwrite(dev_t dev, struct uio *uio, int
 int
 tunpoll(dev_t dev, int events, struct proc *p)
 {
-	int			 revents, s;
-	struct tun_softc	*tp;
-	struct ifnet		*ifp;
-	struct mbuf		*m;
+	struct tun_softc *tp;
 
 	if ((tp = tun_lookup(minor(dev))) == NULL)
 		return (POLLERR);
+	return (tun_dev_poll(tp, events, p));
+}
+
+int
+tappoll(dev_t dev, int events, struct proc *p)
+{
+	struct tun_softc *tp;
+
+	if ((tp = tap_lookup(minor(dev))) == NULL)
+		return (POLLERR);
+	return (tun_dev_poll(tp, events, p));
+}
+
+int
+tun_dev_poll(struct tun_softc *tp, int events, struct proc *p)
+{
+	int			 revents, s;
+	struct ifnet		*ifp;
+	struct mbuf		*m;
 
 	ifp = &tp->tun_if;
 	revents = 0;
@@ -977,13 +1055,29 @@ tunpoll(dev_t dev, int events, struct pr
 int
 tunkqfilter(dev_t dev, struct knote *kn)
 {
-	int			 s;
-	struct klist		*klist;
-	struct tun_softc	*tp;
-	struct ifnet		*ifp;
+	struct tun_softc *tp;
+
+	if ((tp = tun_lookup(minor(dev))) == NULL)
+		return (ENXIO);
+	return (tun_dev_kqfilter(tp, kn));
+}
+
+int
+tapkqfilter(dev_t dev, struct knote *kn)
+{
+	struct tun_softc *tp;
 
 	if ((tp = tun_lookup(minor(dev))) == NULL)
 		return (ENXIO);
+	return (tun_dev_kqfilter(tp, kn));
+}
+
+int
+tun_dev_kqfilter(struct tun_softc *tp, struct knote *kn)
+{
+	int			 s;
+	struct klist		*klist;
+	struct ifnet		*ifp;
 
 	ifp = &tp->tun_if;
 
@@ -1090,7 +1184,7 @@ filt_tunwrite(struct knote *kn, long hin
 }
 
 void
-tunstart(struct ifnet *ifp)
+tun_start(struct ifnet *ifp)
 {
 	struct tun_softc	*tp = ifp->if_softc;
 	struct mbuf		*m;
Index: sys/arch/alpha/alpha/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/alpha/conf.c,v
retrieving revision 1.78
diff -u -p -r1.78 conf.c
--- sys/arch/alpha/alpha/conf.c	11 Dec 2014 19:44:16 -0000	1.78
+++ sys/arch/alpha/alpha/conf.c	13 Sep 2015 09:16:19 -0000
@@ -200,6 +200,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 65: was urio */
 	cdev_notdef(),			/* 66: was USB scanners */
 	cdev_fuse_init(NFUSE,fuse),	/* 67: fuse */
+	cdev_tun_init(NTUN,tap),	/* 68: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/amd64/amd64/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/conf.c,v
retrieving revision 1.50
diff -u -p -r1.50 conf.c
--- sys/arch/amd64/amd64/conf.c	14 Mar 2015 03:38:46 -0000	1.50
+++ sys/arch/amd64/amd64/conf.c	13 Sep 2015 09:16:39 -0000
@@ -279,6 +279,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 90: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),     /* 91: pppx */
 	cdev_fuse_init(NFUSE,fuse),	/* 92: fuse */
+	cdev_tun_init(NTUN,tap),	/* 93: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/arm/arm/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/conf.c,v
retrieving revision 1.41
diff -u -p -r1.41 conf.c
--- sys/arch/arm/arm/conf.c	11 Dec 2014 19:44:17 -0000	1.41
+++ sys/arch/arm/arm/conf.c	13 Sep 2015 09:17:34 -0000
@@ -381,6 +381,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),
 	cdev_disk_init(1,diskmap),		/* 102: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),		/* 103: pppx */
+	cdev_tun_init(NTUN,tap),		/* 104: Ethernet tap */
 };
 
 int nblkdev = nitems(bdevsw);
Index: sys/arch/aviion/aviion/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/aviion/aviion/conf.c,v
retrieving revision 1.19
diff -u -p -r1.19 conf.c
--- sys/arch/aviion/aviion/conf.c	9 Oct 2014 04:10:03 -0000	1.19
+++ sys/arch/aviion/aviion/conf.c	13 Sep 2015 09:17:54 -0000
@@ -143,6 +143,7 @@ struct cdevsw	cdevsw[] =
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 	cdev_disk_init(1,diskmap),	/* 54: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 55: pppx */
+	cdev_tun_init(NTUN,tap),	/* 56: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/hppa/hppa/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/conf.c,v
retrieving revision 1.62
diff -u -p -r1.62 conf.c
--- sys/arch/hppa/hppa/conf.c	11 Dec 2014 19:44:17 -0000	1.62
+++ sys/arch/hppa/hppa/conf.c	13 Sep 2015 09:18:14 -0000
@@ -184,6 +184,7 @@ struct cdevsw   cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 56: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 57: pppx */
 	cdev_fuse_init(NFUSE,fuse),	/* 58: fuse */
+	cdev_tun_init(NTUN,tap),	/* 59: Ethernet network tunnel */
 };
 int nchrdev = nitems(cdevsw);
 
Index: sys/arch/hppa64/hppa64/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/conf.c,v
retrieving revision 1.29
diff -u -p -r1.29 conf.c
--- sys/arch/hppa64/hppa64/conf.c	11 Dec 2014 19:44:17 -0000	1.29
+++ sys/arch/hppa64/hppa64/conf.c	13 Sep 2015 09:18:25 -0000
@@ -184,6 +184,7 @@ struct cdevsw   cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 56: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 57: pppx */
 	cdev_fuse_init(NFUSE,fuse),	/* 58: fuse */
+	cdev_tun_init(NTUN,tap),	/* 59: Ethernet network tunnel */
 };
 int nchrdev = nitems(cdevsw);
 
Index: sys/arch/i386/i386/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/conf.c,v
retrieving revision 1.150
diff -u -p -r1.150 conf.c
--- sys/arch/i386/i386/conf.c	11 Dec 2014 19:44:17 -0000	1.150
+++ sys/arch/i386/i386/conf.c	13 Sep 2015 09:18:38 -0000
@@ -285,6 +285,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 91: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),     /* 92: pppx */
 	cdev_fuse_init(NFUSE,fuse),	/* 93: fuse */ 
+	cdev_tun_init(NTUN,tap),	/* 94: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/landisk/landisk/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/landisk/landisk/conf.c,v
retrieving revision 1.31
diff -u -p -r1.31 conf.c
--- sys/arch/landisk/landisk/conf.c	11 Dec 2014 19:44:17 -0000	1.31
+++ sys/arch/landisk/landisk/conf.c	13 Sep 2015 09:19:17 -0000
@@ -357,6 +357,7 @@ struct cdevsw cdevsw[] = {
 	cdev_disk_init(1,diskmap),		/* 101: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),		/* 102: pppx */
 	cdev_fuse_init(NFUSE,fuse),		/* 103: fuse */
+	cdev_tun_init(NTUN,tap),		/* 104: Ethernet network tap */
 };
 
 int nblkdev = nitems(bdevsw);
Index: sys/arch/loongson/loongson/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/loongson/conf.c,v
retrieving revision 1.19
diff -u -p -r1.19 conf.c
--- sys/arch/loongson/loongson/conf.c	11 Dec 2014 19:44:17 -0000	1.19
+++ sys/arch/loongson/loongson/conf.c	13 Sep 2015 09:19:36 -0000
@@ -207,6 +207,7 @@ struct cdevsw	cdevsw[] =
 	cdev_pppx_init(NPPPX,pppx),	/* 71: pppx */
 	cdev_notdef(),			/* 72: was USB scanners */
 	cdev_fuse_init(NFUSE,fuse),	/* 73: fuse */
+	cdev_tun_init(NTUN,tap),	/* 74: Ethernet network tunnel */
 };
 
 int	nchrdev = nitems(cdevsw);
Index: sys/arch/luna88k/luna88k/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/luna88k/luna88k/conf.c,v
retrieving revision 1.26
diff -u -p -r1.26 conf.c
--- sys/arch/luna88k/luna88k/conf.c	3 Mar 2015 23:50:37 -0000	1.26
+++ sys/arch/luna88k/luna88k/conf.c	13 Sep 2015 09:19:49 -0000
@@ -156,6 +156,7 @@ struct cdevsw	cdevsw[] =
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 	cdev_disk_init(1,diskmap),	/* 54: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 55: pppx */
+	cdev_tun_init(NTUN,tap),	/* 56: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/macppc/macppc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/macppc/conf.c,v
retrieving revision 1.62
diff -u -p -r1.62 conf.c
--- sys/arch/macppc/macppc/conf.c	11 Dec 2014 19:44:17 -0000	1.62
+++ sys/arch/macppc/macppc/conf.c	13 Sep 2015 09:20:22 -0000
@@ -226,6 +226,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 86 */
 	cdev_drm_init(NDRM,drm),	/* 87: drm */
 	cdev_fuse_init(NFUSE,fuse),	/* 88: fuse */
+	cdev_tun_init(NTUN,tap),	/* 89: Ethernet network tunnel */
 };
 int nchrdev = nitems(cdevsw);
 
Index: sys/arch/octeon/octeon/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/octeon/conf.c,v
retrieving revision 1.15
diff -u -p -r1.15 conf.c
--- sys/arch/octeon/octeon/conf.c	20 Jul 2015 19:44:32 -0000	1.15
+++ sys/arch/octeon/octeon/conf.c	13 Sep 2015 09:20:41 -0000
@@ -225,6 +225,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 70: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 71: pppx */
 	cdev_notdef(),			/* 72: was USB scanners */
+	cdev_tun_init(NTUN,tap),	/* 73: Ethernet network tunnel */
 };
 
 int	nchrdev = nitems(cdevsw);
Index: sys/arch/sgi/sgi/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/conf.c,v
retrieving revision 1.35
diff -u -p -r1.35 conf.c
--- sys/arch/sgi/sgi/conf.c	11 Dec 2014 19:44:17 -0000	1.35
+++ sys/arch/sgi/sgi/conf.c	13 Sep 2015 09:20:53 -0000
@@ -208,6 +208,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 71: */
 	cdev_notdef(),			/* 72: was USB scanners */
 	cdev_fuse_init(NFUSE,fuse),	/* 73: fuse */
+	cdev_tun_init(NTUN,tap),	/* 74: Ethernet network tunnel */
 };
 
 int	nchrdev = nitems(cdevsw);
Index: sys/arch/socppc/socppc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/socppc/socppc/conf.c,v
retrieving revision 1.23
diff -u -p -r1.23 conf.c
--- sys/arch/socppc/socppc/conf.c	11 Dec 2014 19:44:17 -0000	1.23
+++ sys/arch/socppc/socppc/conf.c	13 Sep 2015 09:21:04 -0000
@@ -203,6 +203,7 @@ struct cdevsw cdevsw[] = {
 	cdev_pppx_init(NPPPX,pppx),	/* 83: pppx */
 	cdev_hotplug_init(NHOTPLUG,hotplug),	/* 84: devices hot plugging */
 	cdev_fuse_init(NFUSE,fuse),	/* 85: fuse */
+	cdev_tun_init(NTUN,tap),	/* 86: Ethernet network tunnel */
 };
 int nchrdev = nitems(cdevsw);
 
Index: sys/arch/sparc/sparc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/conf.c,v
retrieving revision 1.64
diff -u -p -r1.64 conf.c
--- sys/arch/sparc/sparc/conf.c	9 Oct 2014 04:10:03 -0000	1.64
+++ sys/arch/sparc/sparc/conf.c	13 Sep 2015 09:21:17 -0000
@@ -265,6 +265,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(1,diskmap),	/* 129: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 130: pppx */
 	cdev_hotplug_init(NHOTPLUG,hotplug),	/* 131: devices hot plugging */
+	cdev_tun_init(NTUN,tap),	/* 132: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/sparc64/sparc64/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/conf.c,v
retrieving revision 1.74
diff -u -p -r1.74 conf.c
--- sys/arch/sparc64/sparc64/conf.c	11 Dec 2014 19:44:17 -0000	1.74
+++ sys/arch/sparc64/sparc64/conf.c	13 Sep 2015 09:21:27 -0000
@@ -290,6 +290,7 @@ struct cdevsw	cdevsw[] =
 	cdev_gen_init(NVLDCP,vldcp),	/* 132: vldcp */
 	cdev_vdsp_init(NVDSP,vdsp),	/* 133: vdsp */
 	cdev_fuse_init(NFUSE,fuse),	/* 134: fuse */
+	cdev_tun_init(NTUN,tap),	/* 135: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: sys/arch/vax/vax/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/vax/conf.c,v
retrieving revision 1.70
diff -u -p -r1.70 conf.c
--- sys/arch/vax/vax/conf.c	9 Oct 2014 03:59:59 -0000	1.70
+++ sys/arch/vax/vax/conf.c	13 Sep 2015 09:21:37 -0000
@@ -262,6 +262,7 @@ struct cdevsw	cdevsw[] =
 	cdev_pppx_init(NPPPX,pppx),	/* 80: pppx */
 	cdev_audio_init(NAUDIO,audio),	/* 81: /dev/audio */
 	cdev_fuse_init(NFUSE,fuse),	/* 82: fuse */
+	cdev_tun_init(NTUN,tap),	/* 83: Ethernet network tunnel */
 };
 int	nchrdev = nitems(cdevsw);
 
Index: etc/MAKEDEV.common
===================================================================
RCS file: /cvs/src/etc/MAKEDEV.common,v
retrieving revision 1.78
diff -u -p -r1.78 MAKEDEV.common
--- etc/MAKEDEV.common	11 Dec 2014 19:46:15 -0000	1.78
+++ etc/MAKEDEV.common	13 Sep 2015 14:23:25 -0000
@@ -448,9 +448,11 @@ _mkdev(pf, {-pf*-}, {-M pf c major_pf_c 
 __devitem(bpf, bpf*, Berkeley Packet Filter)dnl
 _mkdev(bpf, {-bpf*-}, {-M bpf$U c major_bpf_c $U 600-}, 600)dnl
 _mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl
+_mkdev(tap, {-tap*-}, {-M tap$U c major_tap_c $U 600-}, 600)dnl
 __devitem(speak, speaker, PC speaker,spkr)dnl
 _mkdev(speak, speaker, {-M speaker c major_speak_c 0 600-})dnl
 __devitem(tun, tun*, Network tunnel driver)dnl
+__devitem(tap, tap*, Layer 2 network tunnel driver)dnl
 __devitem(rnd, *random, In-kernel random data source,random)dnl
 _mkdev(rnd, *random, {-n=0
 	for pre in " " s u a
Index: etc/netstart
===================================================================
RCS file: /cvs/src/etc/netstart,v
retrieving revision 1.155
diff -u -p -r1.155 netstart
--- etc/netstart	13 Sep 2015 13:51:57 -0000	1.155
+++ etc/netstart	13 Sep 2015 18:40:29 -0000
@@ -257,7 +257,7 @@ fi
 
 # Configure all the non-loopback interfaces which we know about, but
 # do not start interfaces which must be delayed. Refer to hostname.if(5)
-ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun bridge pflow"
+ifmstart "" "trunk svlan vlan carp gif gre pfsync pppoe tun tap bridge pflow"
 
 # The trunk interfaces need to come up first in this list.
 # The (s)vlan interfaces need to come up after trunk.
@@ -323,7 +323,7 @@ esac
 # require routes to be set. TUN might depend on PPPoE, and GIF or GRE may
 # depend on either of them. PFLOW might bind to ip addresses configured
 # on either of them.
-ifmstart "pppoe tun gif gre bridge pflow"
+ifmstart "pppoe tun tap gif gre bridge pflow"
 
 # Reject 127/8 other than 127.0.0.1.
 route -qn add -net 127 127.0.0.1 -reject >/dev/null
Index: etc/etc.alpha/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.alpha/MAKEDEV,v
retrieving revision 1.189
diff -u -p -r1.189 MAKEDEV
--- etc/etc.alpha/MAKEDEV	11 Dec 2014 19:48:38 -0000	1.189
+++ etc/etc.alpha/MAKEDEV	13 Sep 2015 14:34:20 -0000
@@ -82,6 +82,7 @@
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
@@ -258,6 +259,10 @@ tuner*)
 	M tuner$U c 58 $(($(($U*2))+16)) 644
 	;;
 
+tap*)
+	M tap$U c 68 $U 600
+	;;
+
 tun*)
 	M tun$U c 7 $U 600
 	;;
@@ -517,17 +522,17 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
-	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
-	R vscsi0 ch0 bio audio0 audio1 audio2 fuse pppx hotplug ptm
-	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
-	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker
-	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0
-	R ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf systrace wd0 wd1 wd2 wd3
-	R std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
+	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
+	R fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2 fuse
+	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1
+	R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3
+	R ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5
+	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.alpha/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.alpha/MAKEDEV.md,v
retrieving revision 1.64
diff -u -p -r1.64 MAKEDEV.md
--- etc/etc.alpha/MAKEDEV.md	11 Dec 2014 19:48:02 -0000	1.64
+++ etc/etc.alpha/MAKEDEV.md	13 Sep 2015 14:25:11 -0000
@@ -76,6 +76,7 @@ _DEV(rmidi, 41)
 _DEV(speak, 40)
 _DEV(systrace, 50)
 _DEV(tun, 7)
+_DEV(tap, 68)
 _DEV(tuner, 58)
 _DEV(uk, 33)
 _DEV(vi, 44)
@@ -114,6 +115,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.amd64/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.amd64/MAKEDEV,v
retrieving revision 1.98
diff -u -p -r1.98 MAKEDEV
--- etc/etc.amd64/MAKEDEV	11 Dec 2014 19:48:38 -0000	1.98
+++ etc/etc.amd64/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -87,6 +87,7 @@
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
@@ -258,6 +259,10 @@ tuner*)
 	M tuner$U c 49 $(($(($U*2))+16)) 644
 	;;
 
+tap*)
+	M tap$U c 93 $U 600
+	;;
+
 tun*)
 	M tun$U c 40 $U 600
 	;;
@@ -543,16 +548,17 @@ local)
 all)
 	R drm0 drm1 drm2 drm3 nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1
 	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1
-	R rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G
-	R fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0
-	R ch0 audio0 audio1 audio2 fuse pppx hotplug ptm gpr0 local
-	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0
-	R video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01
-	R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
+	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C
+	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
+	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx
+	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1
+	R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3
+	R ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr systrace wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.amd64/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.amd64/MAKEDEV.md,v
retrieving revision 1.59
diff -u -p -r1.59 MAKEDEV.md
--- etc/etc.amd64/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.59
+++ etc/etc.amd64/MAKEDEV.md	13 Sep 2015 14:25:28 -0000
@@ -85,6 +85,7 @@ _DEV(rmidi, 52)
 _DEV(speak, 27)
 _DEV(systrace, 78)
 _DEV(tun, 40)
+_DEV(tap, 93)
 _DEV(tuner, 49)
 _DEV(uk, 20)
 _DEV(vi, 44)
@@ -118,6 +119,7 @@ target(all, pty, 0)dnl
 target(all, bio)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.armish/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.armish/MAKEDEV,v
retrieving revision 1.58
diff -u -p -r1.58 MAKEDEV
--- etc/etc.armish/MAKEDEV	11 Dec 2014 19:48:38 -0000	1.58
+++ etc/etc.armish/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -74,6 +74,7 @@
 #	*random	In-kernel random data source
 #	rmidi*	Raw MIDI devices
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
@@ -244,6 +245,10 @@ uk*)
 	M uk$U c 28 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 104 $U 600
+	;;
+
 tun*)
 	M tun$U c 33 $U 600
 	;;
@@ -462,13 +467,14 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 audio0
-	R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
+	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
+	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
+	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.armish/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.armish/MAKEDEV.md,v
retrieving revision 1.34
diff -u -p -r1.34 MAKEDEV.md
--- etc/etc.armish/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.34
+++ etc/etc.armish/MAKEDEV.md	13 Sep 2015 14:25:57 -0000
@@ -79,6 +79,7 @@ _DEV(radio, 97)
 _DEV(rnd, 40)
 _DEV(rmidi, 57)
 _DEV(tun, 33)
+_DEV(tap, 104)
 _DEV(uk, 28)
 _DEV(systrace, 50)
 _DEV(tuner, 75)
@@ -107,6 +108,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.armv7/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.armv7/MAKEDEV,v
retrieving revision 1.10
diff -u -p -r1.10 MAKEDEV
--- etc/etc.armv7/MAKEDEV	11 Dec 2014 19:48:38 -0000	1.10
+++ etc/etc.armv7/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -75,6 +75,7 @@
 #	*random	In-kernel random data source
 #	rmidi*	Raw MIDI devices
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
@@ -245,6 +246,10 @@ uk*)
 	M uk$U c 28 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 104 $U 600
+	;;
+
 tun*)
 	M tun$U c 33 $U 600
 	;;
@@ -468,13 +473,13 @@ local)
 all)
 	R gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7 gpio8 vnd0
 	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0
-	R cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 fuse pppx
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
+	R vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 tuner0 radio0 video0 video1 uk0 random tty00 tty01
+	R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
+	R apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.armv7/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.armv7/MAKEDEV.md,v
retrieving revision 1.8
diff -u -p -r1.8 MAKEDEV.md
--- etc/etc.armv7/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.8
+++ etc/etc.armv7/MAKEDEV.md	13 Sep 2015 14:26:18 -0000
@@ -80,6 +80,7 @@ _DEV(radio, 97)
 _DEV(rnd, 40)
 _DEV(rmidi, 57)
 _DEV(tun, 33)
+_DEV(tap, 104)
 _DEV(uk, 28)
 _DEV(systrace, 50)
 _DEV(tuner, 75)
@@ -107,6 +108,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.aviion/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.aviion/MAKEDEV,v
retrieving revision 1.32
diff -u -p -r1.32 MAKEDEV
--- etc/etc.aviion/MAKEDEV	9 Oct 2014 04:38:02 -0000	1.32
+++ etc/etc.aviion/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.19 2014/03/18 22:36:29 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.76 2014/08/20 11:23:40 mikeb Exp 
+#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.20 2014/10/09 04:33:51 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.78 2014/12/11 19:46:15 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -55,6 +55,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -205,6 +206,10 @@ uk*)
 	M uk$U c 41 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 56 $U 600
+	;;
+
 tun*)
 	M tun$U c 23 $U 600
 	;;
@@ -335,9 +340,10 @@ ramdisk)
 
 all)
 	R ttya ttyb ttyc vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0
-	R cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 nvram0 fuse
-	R pppx ptm local uk0 random pf systrace std st0 st1 fd
+	R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
+	R vscsi0 ch0 nvram0 fuse pppx ptm local uk0 random pf systrace
+	R std st0 st1 fd
 	;;
 
 sd*)
Index: etc/etc.aviion/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.aviion/MAKEDEV.md,v
retrieving revision 1.20
diff -u -p -r1.20 MAKEDEV.md
--- etc/etc.aviion/MAKEDEV.md	9 Oct 2014 04:33:51 -0000	1.20
+++ etc/etc.aviion/MAKEDEV.md	13 Sep 2015 14:27:00 -0000
@@ -52,6 +52,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4)dnl
@@ -98,6 +99,7 @@ _DEV(pppx, 55)
 _DEV(rnd, 40)
 _DEV(systrace, 50)
 _DEV(tun, 23)
+_DEV(tap, 56)
 _DEV(uk, 41)
 _DEV(vscsi, 53)
 dnl
Index: etc/etc.hppa/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.hppa/MAKEDEV,v
retrieving revision 1.129
diff -u -p -r1.129 MAKEDEV
--- etc/etc.hppa/MAKEDEV	11 Dec 2014 19:48:38 -0000	1.129
+++ etc/etc.hppa/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -76,6 +76,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -206,7 +207,7 @@ U=`unt $i`
 case $i in
 ramdisk)
 	R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	R pty0 bpf0 bpf1 tun0 tun1 bio diskmap
+	R pty0 bpf0 bpf1 bio diskmap
 	;;
 
 std)
@@ -237,6 +238,10 @@ uk*)
 	M uk$U c 15 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 59 $U 600
+	;;
+
 tun*)
 	M tun$U c 18 $U 600
 	;;
@@ -479,14 +484,14 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
-	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
-	R vscsi0 bio ch0 audio0 audio1 audio2 fuse pppx hotplug ptm
-	R local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
-	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
+	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
+	R fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2 fuse
+	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00
+	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
+	R tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.hppa/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.hppa/MAKEDEV.md,v
retrieving revision 1.55
diff -u -p -r1.55 MAKEDEV.md
--- etc/etc.hppa/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.55
+++ etc/etc.hppa/MAKEDEV.md	13 Sep 2015 14:28:34 -0000
@@ -71,6 +71,7 @@ _DEV(pppx,57)
 _DEV(rnd, 20)
 _DEV(systrace, 34)
 _DEV(tun, 18)
+_DEV(tap, 59)
 _DEV(uk, 15)
 _DEV(vi, 33)
 _DEV(vscsi, 54)
@@ -79,7 +80,7 @@ divert(__mddivert)dnl
 dnl
 ramdisk)
 	_recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	_recurse pty0 bpf0 bpf1 tun0 tun1 bio diskmap
+	_recurse pty0 bpf0 bpf1 bio diskmap
 	;;
 
 _std(1, 2, 25, 6)
@@ -98,6 +99,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
@@ -105,4 +107,3 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 
 target(all, vnd, 0, 1, 2, 3)dnl
 target(ramd, pty, 0)dnl
 target(ramd, hil)dnl
-target(ramd, tun, 0, 1)dnl
Index: etc/etc.hppa64/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.hppa64/MAKEDEV,v
retrieving revision 1.63
diff -u -p -r1.63 MAKEDEV
--- etc/etc.hppa64/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.63
+++ etc/etc.hppa64/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -75,6 +75,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -205,7 +206,7 @@ U=`unt $i`
 case $i in
 ramdisk)
 	R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	R pty0 bpf0 bpf1 tun0 tun1 bio diskmap
+	R pty0 bpf0 bpf1 bio diskmap
 	;;
 
 std)
@@ -236,6 +237,10 @@ uk*)
 	M uk$U c 15 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 59 $U 600
+	;;
+
 tun*)
 	M tun$U c 18 $U 600
 	;;
@@ -474,14 +479,14 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
-	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
-	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx ptm local wscons
-	R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
-	R tty06 tty07 tty08 tty09 tty0a tty0b pf systrace wd0 wd1 wd2
-	R wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
+	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
+	R fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf systrace
+	R wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.hppa64/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.hppa64/MAKEDEV.md,v
retrieving revision 1.31
diff -u -p -r1.31 MAKEDEV.md
--- etc/etc.hppa64/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.31
+++ etc/etc.hppa64/MAKEDEV.md	13 Sep 2015 14:29:01 -0000
@@ -70,6 +70,7 @@ _DEV(pppx,57)
 _DEV(rnd, 20)
 _DEV(systrace, 34)
 _DEV(tun, 18)
+_DEV(tap, 59)
 _DEV(uk, 15)
 _DEV(vi, 33)
 _DEV(vscsi, 54)
@@ -78,7 +79,7 @@ divert(__mddivert)dnl
 dnl
 ramdisk)
 	_recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	_recurse pty0 bpf0 bpf1 tun0 tun1 bio diskmap
+	_recurse pty0 bpf0 bpf1 bio diskmap
 	;;
 
 _std(1, 2, 25, 6)
@@ -97,6 +98,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
@@ -104,4 +106,3 @@ target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 
 target(all, vnd, 0, 1, 2, 3)dnl
 target(ramd, pty, 0)dnl
 target(ramd, hil)dnl
-target(ramd, tun, 0, 1)dnl
Index: etc/etc.i386/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.i386/MAKEDEV,v
retrieving revision 1.239
diff -u -p -r1.239 MAKEDEV
--- etc/etc.i386/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.239
+++ etc/etc.i386/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -89,6 +89,7 @@
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
@@ -260,6 +261,10 @@ tuner*)
 	M tuner$U c 49 $(($(($U*2))+16)) 644
 	;;
 
+tap*)
+	M tap$U c 94 $U 600
+	;;
+
 tun*)
 	M tun$U c 40 $U 600
 	;;
@@ -553,16 +558,17 @@ local)
 all)
 	R amdmsr drm0 drm1 drm2 drm3 nvram gpio0 gpio1 gpio2 bktr0
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
-	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
-	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm gpr0
-	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
-	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker
-	R video0 video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1
-	R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
-	R ttyc7 apm pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
+	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
+	R fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx
+	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 speaker video0 video1 uk0 random joy0 joy1
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04
+	R tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2
+	R ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr systrace wd0 wd1
+	R wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.i386/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.i386/MAKEDEV.md,v
retrieving revision 1.74
diff -u -p -r1.74 MAKEDEV.md
--- etc/etc.i386/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.74
+++ etc/etc.i386/MAKEDEV.md	13 Sep 2015 14:29:29 -0000
@@ -88,6 +88,7 @@ _DEV(rmidi, 52)
 _DEV(speak, 27)
 _DEV(systrace, 78)
 _DEV(tun, 40)
+_DEV(tap, 94)
 _DEV(tuner, 49)
 _DEV(uk, 20)
 _DEV(vi, 44)
@@ -121,6 +122,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.landisk/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.landisk/MAKEDEV,v
retrieving revision 1.58
diff -u -p -r1.58 MAKEDEV
--- etc/etc.landisk/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.58
+++ etc/etc.landisk/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -73,6 +73,7 @@
 #	rmidi*	Raw MIDI devices
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -233,6 +234,10 @@ uk*)
 	M uk$U c 28 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 104 $U 600
+	;;
+
 tun*)
 	M tun$U c 33 $U 600
 	;;
@@ -443,12 +448,12 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 ttya audio0
-	R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 radio0 video0 video1 uk0 random pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
+	R vscsi0 ch0 ttya audio0 audio1 audio2 fuse pppx hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
+	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 video0 video1 uk0
+	R random pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.landisk/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.landisk/MAKEDEV.md,v
retrieving revision 1.37
diff -u -p -r1.37 MAKEDEV.md
--- etc/etc.landisk/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.37
+++ etc/etc.landisk/MAKEDEV.md	13 Sep 2015 14:29:51 -0000
@@ -84,6 +84,7 @@ _DEV(rnd, 40)
 _DEV(rmidi, 57)
 _DEV(systrace, 50)
 _DEV(tun, 33)
+_DEV(tap, 104)
 dnl _DEV(tuner, 75)
 _DEV(uk, 28)
 _DEV(vi, 77)
@@ -112,6 +113,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.loongson/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.loongson/MAKEDEV,v
retrieving revision 1.39
diff -u -p -r1.39 MAKEDEV
--- etc/etc.loongson/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.39
+++ etc/etc.loongson/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -73,6 +73,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -228,6 +229,10 @@ uk*)
 	M uk$U c 32 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 74 $U 600
+	;;
+
 tun*)
 	M tun$U c 13 $U 600
 	;;
@@ -442,12 +447,13 @@ ramdisk)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap vscsi0
-	R audio0 audio1 audio2 fuse pppx hotplug ptm local wscons pci0
-	R pci1 pci2 pci3 uall video0 video1 uk0 random tty00 tty01
-	R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
-	R apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
+	R diskmap vscsi0 audio0 audio1 audio2 fuse pppx hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
+	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.loongson/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.loongson/MAKEDEV.md,v
retrieving revision 1.21
diff -u -p -r1.21 MAKEDEV.md
--- etc/etc.loongson/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.21
+++ etc/etc.loongson/MAKEDEV.md	13 Sep 2015 14:30:32 -0000
@@ -76,6 +76,7 @@ _DEV(pppx, 71)
 _DEV(rnd, 33)
 _DEV(systrace, 50)
 _DEV(tun, 13)
+_DEV(tap, 74)
 _DEV(uk, 32)
 _DEV(vi, 45)
 _DEV(vscsi, 69)
@@ -97,6 +98,7 @@ target(all, pty, 0, 1, 2)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.luna88k/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.luna88k/MAKEDEV,v
retrieving revision 1.59
diff -u -p -r1.59 MAKEDEV
--- etc/etc.luna88k/MAKEDEV	5 Mar 2015 21:42:34 -0000	1.59
+++ etc/etc.luna88k/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -66,6 +66,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -216,6 +217,10 @@ uk*)
 	M uk$U c 41 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 56 $U 600
+	;;
+
 tun*)
 	M tun$U c 23 $U 600
 	;;
@@ -396,11 +401,11 @@ ramdisk)
 
 all)
 	R pcex audio0 lcd ttya vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
-	R sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3
-	R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 fuse
-	R pppx ptm local wscons uk0 random tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R sd4 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio
+	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
+	R diskmap vscsi0 ch0 fuse pppx ptm local wscons uk0 random
+	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
+	R tty0a tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.luna88k/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.luna88k/MAKEDEV.md,v
retrieving revision 1.25
diff -u -p -r1.25 MAKEDEV.md
--- etc/etc.luna88k/MAKEDEV.md	5 Mar 2015 21:37:38 -0000	1.25
+++ etc/etc.luna88k/MAKEDEV.md	13 Sep 2015 14:31:07 -0000
@@ -46,6 +46,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4)dnl
@@ -106,6 +107,7 @@ _DEV(pppx, 55)
 _DEV(rnd, 40)
 _DEV(systrace, 50)
 _DEV(tun, 23)
+_DEV(tap, 56)
 _DEV(uk, 41)
 _DEV(vscsi, 53)
 dnl
Index: etc/etc.macppc/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.macppc/MAKEDEV,v
retrieving revision 1.137
diff -u -p -r1.137 MAKEDEV
--- etc/etc.macppc/MAKEDEV	11 Mar 2015 18:44:13 -0000	1.137
+++ etc/etc.macppc/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.63 2014/12/11 19:48:03 tedu Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.64 2015/03/11 18:43:11 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.78 2014/12/11 19:46:15 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -80,6 +80,7 @@
 #	rmidi*	Raw MIDI devices
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
@@ -243,6 +244,10 @@ tuner*)
 	M tuner$U c 75 $(($(($U*2))+16)) 644
 	;;
 
+tap*)
+	M tap$U c 89 $U 600
+	;;
+
 tun*)
 	M tun$U c 23 $U 600
 	;;
@@ -499,13 +504,14 @@ ramdisk)
 all)
 	R drm0 drm1 drm2 drm3 bio gpio0 gpio1 gpio2 vnd0 vnd1 vnd2
 	R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0
-	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb audio0
-	R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3
+	R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa
+	R cuab ttya ttyb audio0 audio1 audio2 fuse pppx hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
+	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0
+	R video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 tty06
+	R tty07 tty08 tty09 tty0a tty0b apm pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.macppc/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.macppc/MAKEDEV.md,v
retrieving revision 1.64
diff -u -p -r1.64 MAKEDEV.md
--- etc/etc.macppc/MAKEDEV.md	11 Mar 2015 18:43:11 -0000	1.64
+++ etc/etc.macppc/MAKEDEV.md	13 Sep 2015 14:31:32 -0000
@@ -91,6 +91,7 @@ _DEV(rnd, 40)
 _DEV(rmidi, 52)
 _DEV(systrace, 50)
 _DEV(tun, 23)
+_DEV(tap, 89)
 _DEV(tuner, 75)
 _DEV(uk, 41)
 _DEV(vi, 45)
@@ -117,6 +118,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.octeon/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.octeon/MAKEDEV,v
retrieving revision 1.15
diff -u -p -r1.15 MAKEDEV
--- etc/etc.octeon/MAKEDEV	28 Jun 2015 11:56:35 -0000	1.15
+++ etc/etc.octeon/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -70,6 +70,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -225,6 +226,10 @@ uk*)
 	M uk$U c 32 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 73 $U 600
+	;;
+
 tun*)
 	M tun$U c 13 $U 600
 	;;
@@ -417,12 +422,13 @@ ramdisk)
 
 all)
 	R octcf0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
-	R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2
-	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap
-	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local
-	R wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0 random
-	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
-	R tty0a tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3
+	R bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
+	R pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx
+	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0
+	R video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05 tty06
+	R tty07 tty08 tty09 tty0a tty0b pf systrace wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 octcf*|wd*|sd*)
Index: etc/etc.octeon/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.octeon/MAKEDEV.md,v
retrieving revision 1.7
diff -u -p -r1.7 MAKEDEV.md
--- etc/etc.octeon/MAKEDEV.md	28 Jun 2015 11:53:56 -0000	1.7
+++ etc/etc.octeon/MAKEDEV.md	13 Sep 2015 14:31:52 -0000
@@ -79,6 +79,7 @@ _DEV(pppx, 71)
 _DEV(rnd, 33)
 _DEV(systrace, 50)
 _DEV(tun, 13)
+_DEV(tap, 73)
 _DEV(uk, 32)
 _DEV(vi, 45)
 _DEV(vscsi, 69)
@@ -98,6 +99,7 @@ target(all, pty, 0, 1, 2)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
Index: etc/etc.sgi/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.sgi/MAKEDEV,v
retrieving revision 1.82
diff -u -p -r1.82 MAKEDEV
--- etc/etc.sgi/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.82
+++ etc/etc.sgi/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -73,6 +73,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
@@ -228,6 +229,10 @@ uk*)
 	M uk$U c 32 $U 640 operator
 	;;
 
+tap*)
+	M tap$U c 74 $U 600
+	;;
+
 tun*)
 	M tun$U c 13 $U 600
 	;;
@@ -452,12 +457,13 @@ ramdisk)
 
 all)
 	R ttya ttyb vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6
-	R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
-	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
-	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2
+	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	R pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2 fuse
+	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.sgi/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.sgi/MAKEDEV.md,v
retrieving revision 1.43
diff -u -p -r1.43 MAKEDEV.md
--- etc/etc.sgi/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.43
+++ etc/etc.sgi/MAKEDEV.md	13 Sep 2015 14:32:16 -0000
@@ -84,6 +84,7 @@ _DEV(pppx, 70)
 _DEV(rnd, 33)
 _DEV(systrace, 50)
 _DEV(tun, 13)
+_DEV(tap, 74)
 _DEV(uk, 32)
 _DEV(vi, 45)
 _DEV(vscsi, 68)
@@ -103,6 +104,7 @@ target(all, pty, 0, 1, 2)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
Index: etc/etc.socppc/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.socppc/MAKEDEV,v
retrieving revision 1.45
diff -u -p -r1.45 MAKEDEV
--- etc/etc.socppc/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.45
+++ etc/etc.socppc/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -70,6 +70,7 @@
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tun*	Network tunnel driver
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
Index: etc/etc.socppc/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.socppc/MAKEDEV.md,v
retrieving revision 1.26
diff -u -p -r1.26 MAKEDEV.md
--- etc/etc.socppc/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.26
+++ etc/etc.socppc/MAKEDEV.md	13 Sep 2015 14:32:42 -0000
@@ -71,6 +71,7 @@ dnl _DEV(radio, 76)
 _DEV(rnd, 40)
 _DEV(systrace, 50)
 _DEV(tun, 23)
+_DEV(tun, 86)
 dnl _DEV(tuner, 75)
 dnl _DEV(uk, 41)
 _DEV(vi, 44)
@@ -91,6 +92,7 @@ target(all, diskmap)dnl
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
 target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
Index: etc/etc.sparc/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.sparc/MAKEDEV,v
retrieving revision 1.189
diff -u -p -r1.189 MAKEDEV
--- etc/etc.sparc/MAKEDEV	11 Mar 2015 18:44:13 -0000	1.189
+++ etc/etc.sparc/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.54 2015/03/11 18:13:47 deraadt Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.55 2015/03/11 18:43:11 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.78 2014/12/11 19:46:15 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -76,6 +76,7 @@
 #	pppx*	PPP Multiplexer
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
Index: etc/etc.sparc/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.sparc/MAKEDEV.md,v
retrieving revision 1.55
diff -u -p -r1.55 MAKEDEV.md
--- etc/etc.sparc/MAKEDEV.md	11 Mar 2015 18:43:11 -0000	1.55
+++ etc/etc.sparc/MAKEDEV.md	13 Sep 2015 14:33:07 -0000
@@ -104,6 +104,7 @@ _DEV(pppx, 130)
 _DEV(rnd, 119)
 _DEV(systrace, 50)
 _DEV(tun, 111)
+_DEV(tun, 132)
 _DEV(uk, 120)
 _DEV(vscsi, 128)
 dnl
@@ -133,6 +134,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.sparc64/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.sparc64/MAKEDEV,v
retrieving revision 1.179
diff -u -p -r1.179 MAKEDEV
--- etc/etc.sparc64/MAKEDEV	11 Mar 2015 18:44:13 -0000	1.179
+++ etc/etc.sparc64/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.80 2014/12/11 19:48:03 tedu Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.81 2015/03/11 18:43:11 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.78 2014/12/11 19:46:15 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -88,6 +88,7 @@
 #	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	uperf	Performance counters
Index: etc/etc.sparc64/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.sparc64/MAKEDEV.md,v
retrieving revision 1.81
diff -u -p -r1.81 MAKEDEV.md
--- etc/etc.sparc64/MAKEDEV.md	11 Mar 2015 18:43:11 -0000	1.81
+++ etc/etc.sparc64/MAKEDEV.md	13 Sep 2015 14:33:33 -0000
@@ -122,6 +122,7 @@ _DEV(rmidi, 68)
 _DEV(rnd, 119)
 _DEV(systrace, 50)
 _DEV(tun, 111)
+_DEV(tun, 135)
 _DEV(uk, 60)
 _DEV(uperf, 25)
 _DEV(vi, 44)
@@ -162,6 +163,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl
Index: etc/etc.vax/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.vax/MAKEDEV,v
retrieving revision 1.132
diff -u -p -r1.132 MAKEDEV
--- etc/etc.vax/MAKEDEV	9 Oct 2014 04:38:02 -0000	1.132
+++ etc/etc.vax/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.52 2014/03/19 15:28:16 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.76 2014/08/20 11:23:40 mikeb Exp 
+#	OpenBSD: etc.vax/MAKEDEV.md,v 1.53 2014/10/09 04:33:51 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.78 2014/12/11 19:46:15 tedu Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -67,6 +67,7 @@
 #	pppx*	PPP Multiplexer
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
Index: etc/etc.vax/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.vax/MAKEDEV.md,v
retrieving revision 1.53
diff -u -p -r1.53 MAKEDEV.md
--- etc/etc.vax/MAKEDEV.md	9 Oct 2014 04:33:51 -0000	1.53
+++ etc/etc.vax/MAKEDEV.md	13 Sep 2015 14:33:52 -0000
@@ -128,6 +128,7 @@ _DEV(pppx, 80)
 _DEV(rnd, 67)
 _DEV(systrace, 49)
 _DEV(tun, 57)
+_DEV(tun, 83)
 _DEV(uk, 65)
 _DEV(vscsi, 78)
 dnl
@@ -182,6 +183,7 @@ target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 target(all, bio)dnl
 target(all, tun, 0, 1)dnl
+target(all, tap, 0, 1)dnl
 dnl target(all, rd, 0)dnl
 target(all, cd, 0)dnl
 target(all, sd, 0, 1, 2, 3)dnl
Index: etc/etc.zaurus/MAKEDEV
===================================================================
RCS file: /cvs/src/etc/etc.zaurus/MAKEDEV,v
retrieving revision 1.77
diff -u -p -r1.77 MAKEDEV
--- etc/etc.zaurus/MAKEDEV	11 Dec 2014 19:48:39 -0000	1.77
+++ etc/etc.zaurus/MAKEDEV	13 Sep 2015 14:34:21 -0000
@@ -74,6 +74,7 @@
 #	rmidi*	Raw MIDI devices
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	tap*	Layer 2 network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
@@ -239,6 +240,10 @@ tuner*)
 	M tuner$U c 75 $(($(($U*2))+16)) 644
 	;;
 
+tap*)
+	M tap$U c 104 $U 600
+	;;
+
 tun*)
 	M tun$U c 33 $U 600
 	;;
@@ -456,13 +461,13 @@ local)
 
 all)
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio diskmap vscsi0 ch0 audio0
-	R audio1 audio2 fuse pppx hotplug ptm local wscons uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bpf0
+	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
+	R ptm local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+	R rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random
+	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
+	R tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
Index: etc/etc.zaurus/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.zaurus/MAKEDEV.md,v
retrieving revision 1.40
diff -u -p -r1.40 MAKEDEV.md
--- etc/etc.zaurus/MAKEDEV.md	11 Dec 2014 19:48:03 -0000	1.40
+++ etc/etc.zaurus/MAKEDEV.md	13 Sep 2015 14:34:18 -0000
@@ -79,6 +79,7 @@ _DEV(rnd, 40)
 _DEV(rmidi, 57)
 _DEV(systrace, 50)
 _DEV(tun, 33)
+_DEV(tap, 104)
 _DEV(tuner, 75)
 _DEV(uk, 28)
 _DEV(vi, 38)
@@ -106,6 +107,7 @@ twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 
 target(all, pty, 0)dnl
 target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(all, tun, 0, 1, 2, 3)dnl
+target(all, tap, 0, 1, 2, 3)dnl
 target(all, xy, 0, 1, 2, 3)dnl
 target(all, rd, 0)dnl
 target(all, cd, 0, 1)dnl