diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2018-02-07 01:09:58 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2018-02-07 01:09:58 +0000 |
| commit | 173b776a9b3e108d364069e4b178f093c8ec36f0 (patch) | |
| tree | a54f935f90d8ed8a2e846fbeaa7115ec13910e34 /sys/conf | |
| parent | 8e1cda935e652bbbddcc679878fb39b60baa10b1 (diff) | |
split mobileip(4) out from the gre(4) driver.
having mobileip in gre makes it hard to cut gre up. the current mobileip
code is also broken, so this is def and improvement. it also makes it
easy to disable and remove mobileip in the future.
ok claudio@ henning@
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/conf/files | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index ff356c01069..9945a24c9e1 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.250 2017/10/25 12:38:21 job Exp $ +# $OpenBSD: GENERIC,v 1.251 2018/02/07 01:09:57 dlg Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -17,7 +17,6 @@ option PTRACE # ptrace(2) system call #option WITNESS # witness(4) lock checker #option KVA_GUARDPAGES # slow virtual address recycling (+ guarding) -option POOL_DEBUG # pool corruption detection #option VFSLCKDEBUG # VFS locking checks option CRYPTO # Cryptographic framework @@ -90,6 +89,7 @@ pseudo-device carp # CARP protocol support pseudo-device etherip # EtherIP (RFC 3378) pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) pseudo-device gre # GRE encapsulation interface +pseudo-device mobileip # MobileIP encapsulation interface pseudo-device loop # network loopback pseudo-device mpe # MPLS PE interface pseudo-device mpw # MPLS pseudowire support diff --git a/sys/conf/files b/sys/conf/files index f623c4101e3..d8cc6a02a6b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.657 2018/02/06 23:44:48 henning Exp $ +# $OpenBSD: files,v 1.658 2018/02/07 01:09:57 dlg Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -551,6 +551,7 @@ pseudo-device carp: ifnet, ether pseudo-device sppp: ifnet pseudo-device gif: ifnet pseudo-device gre: ifnet +pseudo-device mobileip: ifnet pseudo-device crypto: ifnet pseudo-device trunk: ifnet, ether, ifmedia pseudo-device mpe: ifnet, ether @@ -799,6 +800,7 @@ file net/rtsock.c file net/slcompress.c ppp file net/if_enc.c enc needs-count file net/if_gre.c gre needs-count +file net/if_mobileip.c mobileip needs-count file net/if_trunk.c trunk needs-count file net/trunklacp.c trunk file net/if_mpe.c mpe needs-count |