Author: pjd
Date: Tue Feb  1 07:58:43 2011
New Revision: 218158
URL: http://svn.freebsd.org/changeset/base/218158

Log:
  Do not set socket send and receive buffer. It will be auto-tuned.
  
  Confirmed by: rwatson
  MFC after:    1 week

Modified:
  head/sbin/hastd/proto_tcp4.c

Modified: head/sbin/hastd/proto_tcp4.c
==============================================================================
--- head/sbin/hastd/proto_tcp4.c        Tue Feb  1 07:50:26 2011        
(r218157)
+++ head/sbin/hastd/proto_tcp4.c        Tue Feb  1 07:58:43 2011        
(r218158)
@@ -170,7 +170,7 @@ static int
 tcp4_common_setup(const char *addr, void **ctxp, int side)
 {
        struct tcp4_ctx *tctx;
-       int ret, val;
+       int ret, nodelay;
 
        tctx = malloc(sizeof(*tctx));
        if (tctx == NULL)
@@ -190,21 +190,11 @@ tcp4_common_setup(const char *addr, void
        }
 
        /* Socket settings. */
-       val = 1;
-       if (setsockopt(tctx->tc_fd, IPPROTO_TCP, TCP_NODELAY, &val,
-           sizeof(val)) == -1) {
+       nodelay = 1;
+       if (setsockopt(tctx->tc_fd, IPPROTO_TCP, TCP_NODELAY, &nodelay,
+           sizeof(nodelay)) == -1) {
                pjdlog_warning("Unable to set TCP_NOELAY on %s", addr);
        }
-       val = 131072;
-       if (setsockopt(tctx->tc_fd, SOL_SOCKET, SO_SNDBUF, &val,
-           sizeof(val)) == -1) {
-               pjdlog_warning("Unable to set send buffer size on %s", addr);
-       }
-       val = 131072;
-       if (setsockopt(tctx->tc_fd, SOL_SOCKET, SO_RCVBUF, &val,
-           sizeof(val)) == -1) {
-               pjdlog_warning("Unable to set receive buffer size on %s", addr);
-       }
 
        tctx->tc_side = side;
        tctx->tc_magic = TCP4_CTX_MAGIC;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to