Page MenuHomeFreeBSD

D47056.id144630.diff
No OneTemporary

D47056.id144630.diff

diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -555,9 +555,9 @@
if ((tp->t_flags & TF_TSO) && V_tcp_do_tso && len > tp->t_maxseg &&
(tp->t_port == 0) &&
((tp->t_flags & TF_SIGNATURE) == 0) &&
- tp->rcv_numsacks == 0 && ((sack_rxmit == 0) || V_tcp_sack_tso) &&
+ ((sack_rxmit == 0) || V_tcp_sack_tso) &&
(ipoptlen == 0 || (ipoptlen == ipsec_optlen &&
- (tp->t_flags2 & TF2_IPSEC_TSO) != 0)) &&
+ (tp->t_flags2 & TF2_IPSEC_TSO) != 0)) &&
!(flags & TH_SYN))
tso = 1;
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
@@ -19929,8 +19929,7 @@
rack_set_state(tp, rack);
}
if ((rack->r_fast_output) &&
- (doing_tlp == 0) &&
- (tp->rcv_numsacks == 0)) {
+ (doing_tlp == 0)) {
int ret;
error = 0;
@@ -20708,7 +20707,7 @@
if ((tp->t_flags & TF_TSO) && V_tcp_do_tso && len > segsiz &&
(tp->t_port == 0) &&
((tp->t_flags & TF_SIGNATURE) == 0) &&
- tp->rcv_numsacks == 0 && sack_rxmit == 0 &&
+ sack_rxmit == 0 &&
ipoptlen == 0)
tso = 1;
{
@@ -20910,7 +20909,6 @@
rack_use_rfo &&
((flags & (TH_SYN|TH_FIN)) == 0) &&
(ipoptlen == 0) &&
- (tp->rcv_numsacks == 0) &&
rack->r_fsb_inited &&
TCPS_HAVEESTABLISHED(tp->t_state) &&
((IN_RECOVERY(tp->t_flags)) == 0) &&
@@ -22550,7 +22548,6 @@
((flags & (TH_SYN|TH_FIN)) == 0) &&
(rsm == NULL) &&
(ipoptlen == 0) &&
- (tp->rcv_numsacks == 0) &&
rack->r_fsb_inited &&
TCPS_HAVEESTABLISHED(tp->t_state) &&
((IN_RECOVERY(tp->t_flags)) == 0) &&
@@ -22578,7 +22575,6 @@
((flags & (TH_SYN|TH_FIN)) == 0) &&
(rsm == NULL) &&
(ipoptlen == 0) &&
- (tp->rcv_numsacks == 0) &&
(rack->r_must_retran == 0) &&
rack->r_fsb_inited &&
TCPS_HAVEESTABLISHED(tp->t_state) &&

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 10:48 PM (13 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33273365
Default Alt Text
D47056.id144630.diff (1 KB)

Event Timeline