summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-03-24 07:18:12 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-03-24 07:18:12 +0000
commit3c5942ec81e3a6b23e4dda8c9b105974433f1108 (patch)
tree6abe9562bdb3774ffa4018250121f1fc65075708 /sys/conf/GENERIC
parent8921b5f3c88aa65c112dec23058e2f056f43669e (diff)
Enable ART.
Leave the define for the moment, this will be changed as soon as we're confident enough. "it must be a 3-line diff" krw@ ok bluhm@, mikeb@, dlg@, reyk@, deraadt@
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 78c138354bf..405efbf2d56 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.225 2016/02/25 20:27:16 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.226 2016/03/24 07:18:11 mpi Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -50,6 +50,7 @@ option TCP_ECN # Explicit Congestion Notification for TCP
option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions
#option TCP_FACK # Forward Acknowledgements for TCP
+option ART # Allotment Routing Table
option INET6 # IPv6
option IPSEC # IPsec
#option KEY # PF_KEY (implied by IPSEC)