summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2018-12-20 23:00:56 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2018-12-20 23:00:56 +0000
commit28f1258be624388ca3f5e58d1757b24fe99c01cd (patch)
treec4cf03c24d25881bee54b1e9f7da06202d3c6ad3 /sys/conf
parent599dd1f39442becfa0ec02a38ff27000a7dff829 (diff)
add bpe(4) or Backbone Provider Edge interfaces
Backbone refers to 802.1ah or 802.1Q Provider Backbone Bridges (PBB), or mac-in-mac, which is like vlans except it completely encapsulates the inner packet rather than just add a shim to it. This removes the need for Backbone Core Bridges (ie, switches between bpe instances) to know all the addresses on all the networks.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC3
-rw-r--r--sys/conf/files4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index e2cd5abf7bd..99d6e7cb1de 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.256 2018/10/18 02:10:54 lteo Exp $
+# $OpenBSD: GENERIC,v 1.257 2018/12/20 23:00:55 dlg Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -94,6 +94,7 @@ pseudo-device mobileip # MobileIP encapsulation interface
pseudo-device loop # network loopback
pseudo-device mpe # MPLS PE interface
pseudo-device mpw # MPLS pseudowire support
+pseudo-device bpe # Provider Backbone Bridge edge interface
pseudo-device pair # Virtual Ethernet interface pair
pseudo-device ppp # PPP
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
diff --git a/sys/conf/files b/sys/conf/files
index a196003bf54..d17bd431133 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.665 2018/08/21 18:06:12 anton Exp $
+# $OpenBSD: files,v 1.666 2018/12/20 23:00:55 dlg Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -563,6 +563,7 @@ pseudo-device crypto: ifnet
pseudo-device trunk: ifnet, ether, ifmedia
pseudo-device mpe: ifnet, ether
pseudo-device mpw: ifnet, ether
+pseudo-device bpe: ifnet, ether, ifmedia
pseudo-device vether: ifnet, ether
pseudo-device pppx: ifnet
pseudo-device vxlan: ifnet, ether, ifmedia
@@ -813,6 +814,7 @@ file net/if_trunk.c trunk needs-count
file net/trunklacp.c trunk
file net/if_mpe.c mpe needs-count
file net/if_mpw.c mpw & bridge needs-count
+file net/if_bpe.c bpe needs-count
file net/if_vether.c vether needs-count
file net/if_pair.c pair needs-count
file net/if_pppx.c pppx needs-count