Page MenuHomeFreeBSD
Files F145601324

D35431.diff
No OneTemporary
Actions

D35431.diff
View Options

diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -970,16 +970,18 @@
}
}
KASSERT(SEQ_LT(hole->start, hole->end), ("%s: hole.start >= hole.end", __func__));
- KASSERT(SEQ_LT(hole->start, tp->snd_fack), ("%s: hole.start >= snd.fack", __func__));
- KASSERT(SEQ_LT(hole->end, tp->snd_fack), ("%s: hole.end >= snd.fack", __func__));
- KASSERT(SEQ_LT(hole->rxmit, tp->snd_fack), ("%s: hole.rxmit >= snd.fack", __func__));
- if (SEQ_GEQ(hole->start, hole->end) ||
- SEQ_GEQ(hole->start, tp->snd_fack) ||
- SEQ_GEQ(hole->end, tp->snd_fack) ||
- SEQ_GEQ(hole->rxmit, tp->snd_fack)) {
- log(LOG_CRIT,"tcp: invalid SACK hole (%u-%u,%u) vs fwd ack %u, ignoring.\n",
- hole->start, hole->end, hole->rxmit, tp->snd_fack);
- return (NULL);
+ if (!(V_tcp_do_newsack)) {
+ KASSERT(SEQ_LT(hole->start, tp->snd_fack), ("%s: hole.start >= snd.fack", __func__));
+ KASSERT(SEQ_LT(hole->end, tp->snd_fack), ("%s: hole.end >= snd.fack", __func__));
+ KASSERT(SEQ_LT(hole->rxmit, tp->snd_fack), ("%s: hole.rxmit >= snd.fack", __func__));
+ if (SEQ_GEQ(hole->start, hole->end) ||
+ SEQ_GEQ(hole->start, tp->snd_fack) ||
+ SEQ_GEQ(hole->end, tp->snd_fack) ||
+ SEQ_GEQ(hole->rxmit, tp->snd_fack)) {
+ log(LOG_CRIT,"tcp: invalid SACK hole (%u-%u,%u) vs fwd ack %u, ignoring.\n",
+ hole->start, hole->end, hole->rxmit, tp->snd_fack);
+ return (NULL);
+ }
}
return (hole);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 23, 1:06 AM (9 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28947673
Default Alt Text
D35431.diff (1 KB)

Event Timeline