The branch, master has been updated via 383a918 s3: allow to set TCP_NODELAYACK socket option on AIX from 31cd1fb s3:smbd/aio: handle_aio_completed() should do nothing if aio_ex->fsp is NULL
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 383a918322c1edd1977fdbce19e52e8c8e6ffac1 Author: Björn Jacke <b...@sernet.de> Date: Tue Nov 15 19:12:02 2011 +0100 s3: allow to set TCP_NODELAYACK socket option on AIX this is the AIX way to disable delayed ACKs, the same like TCP_QUICKACK on Linux Autobuild-User: Björn Jacke <b...@sernet.de> Autobuild-Date: Tue Nov 15 21:00:07 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/util/util_net.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 139c9d4..1f6ecdd 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -803,6 +803,9 @@ static const smb_socket_option socket_options[] = { #ifdef TCP_QUICKACK {"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL}, #endif +#ifdef TCP_NODELAYACK + {"TCP_NODELAYACK", IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL}, +#endif #ifdef TCP_KEEPALIVE_THRESHOLD {"TCP_KEEPALIVE_THRESHOLD", IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD, 0, OPT_INT}, #endif -- Samba Shared Repository