summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/inet/tcp/tcp_fusion.c
diff options
context:
space:
mode:
authorKacheong Poon <Kacheong.Poon@Sun.COM>2010-04-01 10:24:19 -0700
committerKacheong Poon <Kacheong.Poon@Sun.COM>2010-04-01 10:24:19 -0700
commit66cd0f60c3182913d379abb730ae755bf6367126 (patch)
treecbdacc4e58656d42e7d3416641c7988a743eb17b /usr/src/uts/common/inet/tcp/tcp_fusion.c
parentf32a9dd17a38682f8ac7fe31d66bdfaa0e68748d (diff)
downloadillumos-gate-66cd0f60c3182913d379abb730ae755bf6367126.tar.gz
6935348 tcp_sack_info should always be there
6924317 TCP time wait processing is called unnecessarily 6924089 TCP Timer code does double time conversion
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp_fusion.c')
-rw-r--r--usr/src/uts/common/inet/tcp/tcp_fusion.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp_fusion.c b/usr/src/uts/common/inet/tcp/tcp_fusion.c
index f5bd5031ea..aad533de2b 100644
--- a/usr/src/uts/common/inet/tcp/tcp_fusion.c
+++ b/usr/src/uts/common/inet/tcp/tcp_fusion.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <sys/types.h>
@@ -733,9 +732,7 @@ tcp_fuse_rcv_drain(queue_t *q, tcp_t *tcp, mblk_t **sigurg_mpp)
(mp = allocb_tryhard(1)) == NULL) {
/* Alloc failed; try again next time */
tcp->tcp_push_tid = TCP_TIMER(tcp,
- tcp_push_timer,
- MSEC_TO_TICK(
- tcps->tcps_push_timer_interval));
+ tcp_push_timer, tcps->tcps_push_timer_interval);
return (B_TRUE);
} else if (sigurg_mpp != NULL) {
/*