Page MenuHomeFreeBSD
Files F115913232

D49008.diff
No OneTemporary
Actions

D49008.diff
View Options

diff --git a/sys/netinet/cc/cc_cubic.h b/sys/netinet/cc/cc_cubic.h
--- a/sys/netinet/cc/cc_cubic.h
+++ b/sys/netinet/cc/cc_cubic.h
@@ -94,16 +94,8 @@
int64_t sum_rtt_usecs;
/* Size of cwnd just before cwnd was reduced in the last congestion event */
uint64_t W_max;
- /* An estimate for the congestion window in the Reno-friendly region */
- uint64_t W_est;
/* The cwnd at the beginning of the current congestion avoidance stage */
uint64_t cwnd_epoch;
- /*
- * Size of cwnd at the time of setting ssthresh most recently,
- * either upon exiting the first slow start, or just before cwnd
- * was reduced in the last congestion event
- */
- uint64_t cwnd_prior;
/* various flags */
uint32_t flags;
/* Minimum observed rtt in usecs. */
@@ -118,9 +110,7 @@
int undo_t_epoch;
/* Few variables to restore the state after RTO_ERR */
int64_t undo_K;
- uint64_t undo_cwnd_prior;
uint64_t undo_W_max;
- uint64_t undo_W_est;
uint64_t undo_cwnd_epoch;
uint32_t css_baseline_minrtt;
uint32_t css_current_round_minrtt;
diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c
--- a/sys/netinet/cc/cc_cubic.c
+++ b/sys/netinet/cc/cc_cubic.c
@@ -468,8 +468,6 @@
*/
cubic_data->undo_t_epoch = cubic_data->t_epoch;
cubic_data->undo_cwnd_epoch = cubic_data->cwnd_epoch;
- cubic_data->undo_W_est = cubic_data->W_est;
- cubic_data->undo_cwnd_prior = cubic_data->cwnd_prior;
cubic_data->undo_W_max = cubic_data->W_max;
cubic_data->undo_K = cubic_data->K;
if (V_tcp_do_newsack) {
@@ -484,16 +482,13 @@
CUBIC_BETA) >> CUBIC_SHIFT) / mss) * mss;
}
cubic_data->flags |= CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT;
- cubic_data->undo_W_max = cubic_data->W_max;
CCV(ccv, snd_cwnd) = mss;
break;
case CC_RTO_ERR:
cubic_data->flags &= ~(CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT);
cubic_data->K = cubic_data->undo_K;
- cubic_data->cwnd_prior = cubic_data->undo_cwnd_prior;
cubic_data->W_max = cubic_data->undo_W_max;
- cubic_data->W_est = cubic_data->undo_W_est;
cubic_data->cwnd_epoch = cubic_data->undo_cwnd_epoch;
cubic_data->t_epoch = cubic_data->undo_t_epoch;
break;

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 8:18 AM (19 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16661414
Default Alt Text
D49008.diff (2 KB)

Event Timeline