summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2013-10-13 10:10:05 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2013-10-13 10:10:05 +0000
commit728bebe5cfbcacfe290ca38c4777c371e5d0560e (patch)
tree21318ce06a08909b963e7238f07971e33a148f46 /sys/conf/GENERIC
parentdc9aa5495448804b764c4be959bf635dcc8fb033 (diff)
Import vxlan(4), the virtual extensible local area network tunnel
interface. VXLAN is a UDP-based tunnelling protocol for overlaying virtualized layer 2 networks over layer 3 networks. The implementation is based on draft-mahalingam-dutt-dcops-vxlan-04 and has been tested with other implementations in the wild. put it in deraadt@
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 7f05181509a..c4929576efa 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.202 2013/10/01 06:57:25 dlg Exp $
+# $OpenBSD: GENERIC,v 1.203 2013/10/13 10:10:01 reyk Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -107,6 +107,7 @@ pseudo-device sppp 1 # Sync PPP/HDLC
pseudo-device trunk # Trunking support
pseudo-device tun # network tunneling over tty
pseudo-device vether # Virtual ethernet
+#pseudo-device vxlan # Virtual extensible LAN
pseudo-device vlan # IEEE 802.1Q VLAN
pseudo-device bio 1 # ioctl multiplexing device