 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_congctl.c,v 1.26 2018/09/03 16:29:36 riastradh Exp $	*/
+/*	$NetBSD: tcp_congctl.c,v 1.27 2019/10/09 05:29:18 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and Kevin M. Lahey of the Numerical Aerospace Simulation
  * Facility, NASA Ames Research Center.
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
  * This code is derived from software contributed to The NetBSD Foundation
  * by Rui Paulo.
+ *
 @@ -125,27 +125,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.26 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.27 2019/10/09 05:29:18 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_tcp_debug.h"
 #include "opt_tcp_congctl.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -417,32 +417,32 @@ tcp_congctl_fillnames(void)
 /* Window reduction (1-beta) for [New]Reno: 0.5 */
 #define RENO_BETAA 1
 #define RENO_BETAB 2
 /* Window reduction (1-beta) for Cubic: 0.8 */
 #define CUBIC_BETAA 4
 #define CUBIC_BETAB 5
 /* Draft Rhee Section 4.1 */
 #define CUBIC_CA 4
 #define CUBIC_CB 10
 static void
 tcp_common_congestion_exp(struct tcpcb *tp, int betaa, int betab)
+{
-	u_int win;
+	u_long win;
 	/*
 	 * Reduce the congestion window and the slow start threshold.
 	 */
-	win = uimin(tp->snd_wnd, tp->snd_cwnd) * betaa / betab / tp->t_segsz;
+	win = ulmin(tp->snd_wnd, tp->snd_cwnd) * betaa / betab / tp->t_segsz;
 	if (win < 2)
 		win = 2;
 	tp->snd_ssthresh = win * tp->t_segsz;
 	tp->snd_recover = tp->snd_max;
 	tp->snd_cwnd = tp->snd_ssthresh;
 	/*
 	 * When using TCP ECN, notify the peer that
 	 * we reduced the cwnd.
 	 */
 	if (TCP_ECN_ALLOWED(tp))
 		tp->t_flags |= TF_ECN_SND_CWR;
 @@ -509,54 +509,54 @@ tcp_reno_fast_retransmit(struct tcpcb *t
 	 * window size so do congestion avoidance
 	 * (set ssthresh to half the current window
 	 * and pull our congestion window back to
 	 * the new ssthresh).
 	 */
 	tcp_reno_congestion_exp(tp);
 	return tcp_reno_do_fast_retransmit(tp, th);
+}
 static void
 tcp_reno_slow_retransmit(struct tcpcb *tp)
+{
-	u_int win;
+	u_long win;
 	/*
 	 * Close the congestion window down to one segment
 	 * (we'll open it by one segment for each ack we get).
 	 * Since we probably have a window's worth of unacked
 	 * data accumulated, this "slow start" keeps us from
 	 * dumping all that data as back-to-back packets (which
 	 * might overwhelm an intermediate gateway).
+	 *
 	 * There are two phases to the opening: Initially we
 	 * open by one mss on each ack.  This makes the window
 	 * size increase exponentially with time.  If the
 	 * window is larger than the path can handle, this
 	 * exponential growth results in dropped packet(s)
 	 * almost immediately.  To get more time between
 	 * drops but still "push" the network to take advantage
 	 * of improving conditions, we switch from exponential
 	 * to linear window opening at some threshhold size.
 	 * For a threshhold, we use half the current window
 	 * size, truncated to a multiple of the mss.
+	 *
 	 * (the minimum cwnd that will give us exponential
 	 * growth is 2 mss.  We don't allow the threshhold
 	 * to go below this.)
 	 */
-	win = uimin(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_segsz;
+	win = ulmin(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_segsz;
 	if (win < 2)
 		win = 2;
 	/* Loss Window MUST be one segment. */
 	tp->snd_cwnd = tp->t_segsz;
 	tp->snd_ssthresh = win * tp->t_segsz;
 	tp->t_partialacks = -1;
 	tp->t_dupacks = 0;
 	tp->t_bytes_acked = 0;
 	if (TCP_ECN_ALLOWED(tp))
 		tp->t_flags |= TF_ECN_SND_CWR;
+}