Deleted Added
full compact
cc_cubic.c (294931) cc_cubic.c (298995)
1/*-
2 * Copyright (c) 2008-2010 Lawrence Stewart <lstewart@freebsd.org>
3 * Copyright (c) 2010 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * This software was developed by Lawrence Stewart while studying at the Centre
7 * for Advanced Internet Architectures, Swinburne University of Technology, made
8 * possible in part by a grant from the Cisco University Research Program Fund

--- 32 unchanged lines hidden (view full) ---

41 * University of Technology's Centre for Advanced Internet Architectures,
42 * Melbourne, Australia, which was made possible in part by a grant from the
43 * Cisco University Research Program Fund at Community Foundation Silicon
44 * Valley. More details are available at:
45 * http://caia.swin.edu.au/urp/newtcp/
46 */
47
48#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008-2010 Lawrence Stewart <lstewart@freebsd.org>
3 * Copyright (c) 2010 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * This software was developed by Lawrence Stewart while studying at the Centre
7 * for Advanced Internet Architectures, Swinburne University of Technology, made
8 * possible in part by a grant from the Cisco University Research Program Fund

--- 32 unchanged lines hidden (view full) ---

41 * University of Technology's Centre for Advanced Internet Architectures,
42 * Melbourne, Australia, which was made possible in part by a grant from the
43 * Cisco University Research Program Fund at Community Foundation Silicon
44 * Valley. More details are available at:
45 * http://caia.swin.edu.au/urp/newtcp/
46 */
47
48#include <sys/cdefs.h>
49__FBSDID("$FreeBSD: head/sys/netinet/cc/cc_cubic.c 294931 2016-01-27 17:59:39Z glebius $");
49__FBSDID("$FreeBSD: head/sys/netinet/cc/cc_cubic.c 298995 2016-05-03 18:05:43Z pfg $");
50
51#include <sys/param.h>
52#include <sys/kernel.h>
53#include <sys/malloc.h>
54#include <sys/module.h>
55#include <sys/socket.h>
56#include <sys/socketvar.h>
57#include <sys/sysctl.h>

--- 80 unchanged lines hidden (view full) ---

138 else {
139 ticks_since_cong = ticks - cubic_data->t_last_cong;
140
141 /*
142 * The mean RTT is used to best reflect the equations in
143 * the I-D. Using min_rtt in the tf_cwnd calculation
144 * causes w_tf to grow much faster than it should if the
145 * RTT is dominated by network buffering rather than
50
51#include <sys/param.h>
52#include <sys/kernel.h>
53#include <sys/malloc.h>
54#include <sys/module.h>
55#include <sys/socket.h>
56#include <sys/socketvar.h>
57#include <sys/sysctl.h>

--- 80 unchanged lines hidden (view full) ---

138 else {
139 ticks_since_cong = ticks - cubic_data->t_last_cong;
140
141 /*
142 * The mean RTT is used to best reflect the equations in
143 * the I-D. Using min_rtt in the tf_cwnd calculation
144 * causes w_tf to grow much faster than it should if the
145 * RTT is dominated by network buffering rather than
146 * propogation delay.
146 * propagation delay.
147 */
148 w_tf = tf_cwnd(ticks_since_cong,
149 cubic_data->mean_rtt_ticks, cubic_data->max_cwnd,
150 CCV(ccv, t_maxseg));
151
152 w_cubic_next = cubic_cwnd(ticks_since_cong +
153 cubic_data->mean_rtt_ticks, cubic_data->max_cwnd,
154 CCV(ccv, t_maxseg), cubic_data->K);

--- 257 unchanged lines hidden ---
147 */
148 w_tf = tf_cwnd(ticks_since_cong,
149 cubic_data->mean_rtt_ticks, cubic_data->max_cwnd,
150 CCV(ccv, t_maxseg));
151
152 w_cubic_next = cubic_cwnd(ticks_since_cong +
153 cubic_data->mean_rtt_ticks, cubic_data->max_cwnd,
154 CCV(ccv, t_maxseg), cubic_data->K);

--- 257 unchanged lines hidden ---