diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-10-23 15:10:54 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-10-23 15:10:54 +0000 |
| commit | 8198e6d7522509800c26a6a045708e6e0cad691a (patch) | |
| tree | bb8ce202e8fac4e8f910e9c729d4d41f85fe5b9b /sys/conf/GENERIC | |
| parent | da64f9f63c6d4403850bcac66dfe41b50e0c79ce (diff) | |
Allocate a new major for tap(4) also note that pseudo-device tun is for tap
as well. OK dlg@ mpi@
Diffstat (limited to 'sys/conf/GENERIC')
| -rw-r--r-- | sys/conf/GENERIC | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 4aefba11062..a174d9e9122 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.220 2015/08/10 20:35:36 sthen Exp $ +# $OpenBSD: GENERIC,v 1.221 2015/10/23 15:10:53 claudio Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -101,7 +101,7 @@ pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device pppx # PPP multiplexer pseudo-device sppp 1 # Sync PPP/HDLC pseudo-device trunk # Trunking support -pseudo-device tun # network tunneling over tty +pseudo-device tun # network tunneling over tty (tun & tap) pseudo-device vether # Virtual ethernet pseudo-device vxlan # Virtual extensible LAN pseudo-device vlan # IEEE 802.1Q VLAN |