summaryrefslogtreecommitdiffstats
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-08-01 03:06:59 +0000
committerdlg <dlg@openbsd.org>2019-08-01 03:06:59 +0000
commitaa4d48a78f872192af333e04628454332b36072f (patch)
tree21ad6d8d4febf6658f5f17592f5d5ece43992bd6 /sys/conf/GENERIC
parentwire up tpmr(4), an 802.1Q Two-Port MAC Relay implementation (diff)
downloadwireguard-openbsd-aa4d48a78f872192af333e04628454332b36072f.tar.xz
wireguard-openbsd-aa4d48a78f872192af333e04628454332b36072f.zip
enable tpmr(4) so people can try it.
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 9d770e3a285..0e7b3c5ed63 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.263 2019/07/08 01:16:02 dlg Exp $
+# $OpenBSD: GENERIC,v 1.264 2019/08/01 03:06:59 dlg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -102,6 +102,7 @@ pseudo-device pppx # PPP multiplexer
pseudo-device sppp 1 # Sync PPP/HDLC
pseudo-device trunk # Trunking support
pseudo-device aggr # 802.1AX Link Aggregation
+pseudo-device tpmr # 802.1Q Two-Port MAC Relay (TPMR)
pseudo-device tun # network tunneling over tty (tun & tap)
pseudo-device vether # Virtual ethernet
pseudo-device vxlan # Virtual extensible LAN