summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2011-01-07 17:50:43 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2011-01-07 17:50:43 +0000
commitba8c20f2e182424ed1367b88d68e34f4af4c4ca3 (patch)
tree03d05a1b68a921ce094af5e6f7d44820280a8a6b /sys/conf
parent1f7e102bf0ea0844d71f0ac775bc385b4b7ffdd7 (diff)
Add socket option SO_SPLICE to splice together two TCP sockets.
The data received on the source socket will automatically be sent on the drain socket. This allows to write relay daemons with zero data copy. ok markus@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index d41397419f4..2868aa33aaa 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.168 2010/10/18 15:01:21 claudio Exp $
+# $OpenBSD: GENERIC,v 1.169 2011/01/07 17:50:42 bluhm Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -42,6 +42,7 @@ option EXT2FS # Second Extended Filesystem
option MFS # memory file system
option NNPFS # NNPFS filesystem
+option SOCKET_SPLICE # Socket Splicing for TCP
option TCP_SACK # Selective Acknowledgements for TCP
option TCP_ECN # Explicit Congestion Notification for TCP
option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions