[src/trunk]: src/sys/netinet Remove the FAST_MBSEARCH ifdef, send packet pred...

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

details:   https://anonhg.NetBSD.org/src/rev/8fdd622096f1
branches:  trunk
changeset: 555230:8fdd622096f1
user:      ragge <ragge%NetBSD.org@localhost>
date:      Wed Nov 12 10:48:04 2003 +0000

description:
Remove the FAST_MBSEARCH ifdef, send packet prediction is now default.

diffstat:

 sys/netinet/tcp_output.c |  19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diffs (49 lines):

diff -r 3036da609534 -r 8fdd622096f1 sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c  Wed Nov 12 06:45:14 2003 +0000
+++ b/sys/netinet/tcp_output.c  Wed Nov 12 10:48:04 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_output.c,v 1.105 2003/10/24 10:25:40 ragge Exp $   */
+/*     $NetBSD: tcp_output.c,v 1.106 2003/11/12 10:48:04 ragge Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -138,7 +138,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.105 2003/10/24 10:25:40 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.106 2003/11/12 10:48:04 ragge Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -449,18 +449,9 @@
         * data to send is directly following the previous transfer.
         * This is important for large TCP windows.
         */
-       if (
-#ifdef FAST_MBSEARCH
-           off == 0 || tp->t_lastm == NULL ||
-               (tp->t_lastoff + tp->t_lastlen) != off
-#else
-           1
-#endif
-          )
-       {
-#ifdef FAST_MBSEARCH
+       if (off == 0 || tp->t_lastm == NULL ||
+           (tp->t_lastoff + tp->t_lastlen) != off) {
                TCP_OUTPUT_COUNTER_INCR(&tcp_output_predict_miss);
-#endif
                /*
                 * Either a new packet or a retransmit.
                 * Start from the beginning.
@@ -468,9 +459,7 @@
                tp->t_lastm = so->so_snd.sb_mb;
                tp->t_inoff = off;
        } else {
-#ifdef FAST_MBSEARCH
                TCP_OUTPUT_COUNTER_INCR(&tcp_output_predict_hit);
-#endif
                tp->t_inoff += tp->t_lastlen;
        }