diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-04-30 11:06:17 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-04-30 11:06:17 +0000 |
| commit | fdc59587d4b2a19b8d37c49fec507b2dc77f167a (patch) | |
| tree | 497f72feb8986897a02bf8e2441a88c6676f274b /sys/conf | |
| parent | 355f2ac6df8e5933b2d3fca9142356642b6f6780 (diff) | |
Add commented MPLS and mpe(4) entries.
OK sthen, jsg
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 9b4825a5200..db9b446eee6 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.154 2010/03/22 21:02:57 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.155 2010/04/30 11:06:16 claudio Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -68,6 +68,7 @@ option PPP_DEFLATE #option PIPEX # Pppac IP EXtension, for npppd option MROUTING # Multicast router #option PIM # Protocol Independent Multicast +#option MPLS # Multi-Protocol Label Switching #mpath0 at root # SCSI Multipathing #scsibus* at mpath? @@ -107,6 +108,7 @@ pseudo-device tun # network tunneling over tty pseudo-device vlan # IEEE 802.1Q VLAN pseudo-device trunk # Trunking support pseudo-device vether # Virtual ethernet +#pseudo-device mpe # MPLS PE interface # for IPv6 #pseudo-device faith 1 # IPv[46] tcp relay translation i/f |