D46042.id141391.diff
No OneTemporary
Actions

Size

1019 B

Referenced Files

None

Subscribers

None

D46042.id141391.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
	@@ -121,8 +121,6 @@
	uint64_t undo_W_max;
	uint64_t undo_W_est;
	uint64_t undo_cwnd_epoch;
	- /* Number of congestion events experienced */
	- uint64_t num_cong_events;
	uint32_t css_baseline_minrtt;
	uint32_t css_current_round_minrtt;
	uint32_t css_lastround_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
	@@ -490,13 +490,11 @@
	}
	cubic_data->flags \|= CUBICFLAG_CONG_EVENT \| CUBICFLAG_RTO_EVENT;
	cubic_data->undo_W_max = cubic_data->W_max;
	- cubic_data->num_cong_events++;
	CCV(ccv, snd_cwnd) = mss;
	break;

	case CC_RTO_ERR:
	cubic_data->flags &= ~(CUBICFLAG_CONG_EVENT \| CUBICFLAG_RTO_EVENT);
	- cubic_data->num_cong_events--;
	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;