Page MenuHomeFreeBSD
Files F156790812

D43297.id132235.diff
No OneTemporary
Actions

D43297.id132235.diff
View Options

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -418,8 +418,7 @@
case CC_NDUPACK:
if (!IN_FASTRECOVERY(tp->t_flags)) {
tp->snd_recover = tp->snd_max;
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
}
break;
case CC_ECN:
@@ -432,16 +431,14 @@
EXIT_CONGRECOVERY(tp->t_flags);
TCPSTAT_INC(tcps_ecn_rcwnd);
tp->snd_recover = tp->snd_max + 1;
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
}
break;
case CC_RTO:
tp->t_dupacks = 0;
tp->t_bytes_acked = 0;
EXIT_RECOVERY(tp->t_flags);
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
break;
case CC_RTO_ERR:
TCPSTAT_INC(tcps_sndrexmitbad);
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -5924,8 +5924,7 @@
}
rack->r_ctl.rc_prr_recovery_fs = tp->snd_max - tp->snd_una;
tp->snd_recover = tp->snd_max;
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
}
break;
case CC_ECN:
@@ -5939,8 +5938,7 @@
KMOD_TCPSTAT_INC(tcps_ecn_rcwnd);
rack->r_fast_output = 0;
tp->snd_recover = tp->snd_max + 1;
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
}
break;
case CC_RTO:
@@ -5953,8 +5951,7 @@
orig_cwnd = tp->snd_cwnd;
tp->snd_cwnd = ctf_fixed_maxseg(tp);
rack_log_to_prr(rack, 16, orig_cwnd, line);
- if (tp->t_flags2 & TF2_ECN_PERMIT)
- tp->t_flags2 |= TF2_ECN_SND_CWR;
+ tp->t_flags2 |= TF2_ECN_SND_CWR;
break;
case CC_RTO_ERR:
KMOD_TCPSTAT_INC(tcps_sndrexmitbad);

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 10:06 AM (11 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33187766
Default Alt Text
D43297.id132235.diff (1 KB)

Event Timeline