diff options
| author | Michael Tuexen <tuexen@FreeBSD.org> | 2021-06-11 13:37:39 +0000 |
|---|---|---|
| committer | Michael Tuexen <tuexen@FreeBSD.org> | 2021-06-11 13:40:34 +0000 |
| commit | fa3746be4203fc9a3414afb21d964eec8bad74f8 (patch) | |
| tree | f852708342ed8a12cea57a71e3d4d12461e08ef1 | |
| parent | a7cf31da5a29a762848c367aced61910efda95c1 (diff) | |
| -rw-r--r-- | sys/netinet/cc/cc_newreno.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 8f8ca953169e..8f939ad70695 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -111,6 +111,7 @@ newreno_malloc(struct cc_var *ccv) /* NB: nreno is not zeroed, so initialise all fields. */ nreno->beta = V_newreno_beta; nreno->beta_ecn = V_newreno_beta_ecn; + nreno->newreno_flags = 0; ccv->cc_data = nreno; } @@ -254,8 +255,9 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) * has set a flag in our newreno_flags (due to pacing) telling * us to use the lower valued back-off. */ - if (V_cc_do_abe || - (nreno && (nreno->newreno_flags & CC_NEWRENO_BETA_ECN) && (type == CC_ECN))) + if ((type == CC_ECN) && + (V_cc_do_abe || + ((nreno != NULL) && (nreno->newreno_flags & CC_NEWRENO_BETA_ECN)))) factor = beta_ecn; else factor = beta; |
