diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-10-18 15:01:22 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-10-18 15:01:22 +0000 |
| commit | 0d8c7c2ed69710b784f11157a97cbb108812f88c (patch) | |
| tree | f8bbd58f5e53cde28c3d2ef39b26fce9761e9643 /sys | |
| parent | 4e0fc5b2d005138180b61972e5e71a653d91e54b (diff) | |
There is no reason to not include MPLS and mpe(4) in GENERIC. Makes my
life a lot easier. Sure deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/GENERIC | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 38895062121..d41397419f4 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.167 2010/09/24 14:13:47 sobrado Exp $ +# $OpenBSD: GENERIC,v 1.168 2010/10/18 15:01:21 claudio Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -67,7 +67,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 +option MPLS # Multi-Protocol Label Switching #mpath0 at root # SCSI Multipathing #scsibus* at mpath? @@ -100,7 +100,7 @@ pseudo-device carp # CARP protocol support pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gre # GRE encapsulation interface pseudo-device loop # network loopback -#pseudo-device mpe # MPLS PE interface +pseudo-device mpe # MPLS PE interface pseudo-device ppp # PPP pseudo-device pppoe # PPP over Ethernet (RFC 2516) #pseudo-device pppx # PPP multiplexer |