[src/netbsd-1-5]: src/sys/netinet6 Pullup 1.20 [enami]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/97b1cbb9b322
branches:  netbsd-1-5
changeset: 489829:97b1cbb9b322
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Oct 17 21:40:26 2000 +0000

description:
Pullup 1.20 [enami]:
Don't initialize TCP twice on v4/v6 dual stack kernel.

diffstat:

 sys/netinet6/in6_proto.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r add79b6fef6b -r 97b1cbb9b322 sys/netinet6/in6_proto.c
--- a/sys/netinet6/in6_proto.c  Tue Oct 17 21:20:15 2000 +0000
+++ b/sys/netinet6/in6_proto.c  Tue Oct 17 21:40:26 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_proto.c,v 1.17.4.1 2000/08/16 01:22:26 itojun Exp $        */
+/*     $NetBSD: in6_proto.c,v 1.17.4.2 2000/10/17 21:40:26 tv Exp $    */
 /*     $KAME: in6_proto.c,v 1.64 2000/06/20 16:20:27 itojun Exp $      */
 
 /*
@@ -169,8 +169,8 @@
 { SOCK_STREAM, &inet6domain,   IPPROTO_TCP,    PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN,
   tcp6_input,  0,              tcp6_ctlinput,  tcp_ctloutput,
   tcp_usrreq,
-#ifdef INET    /* don't call timeout routines twice */
-  tcp_init,    0,              0,              tcp_drain,
+#ifdef INET    /* don't call initialization and timeout routines twice */
+  0,           0,              0,              tcp_drain,
 #else
   tcp_init,    tcp_fasttimo,   tcp_slowtimo,   tcp_drain,
 #endif