d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from DragonFlyBSD rev 1.10:

Browse Source 
date: 2003/09/02 10:04:47;  author: hsu;  state: Exp;  lines: +5 -6
Account for when Limited Transmit is not congestion window limited.

Obtained from:	DragonFlyBSD
This commit is contained in:
Jeffrey Hsu 2004-01-20 21:40:25 +00:00
parent 1aa9b61068
commit 61a36e3dfc
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/tcp_input.c
View File

@ -1859,13 +1859,12 @@ tcp_input(m, off0)
KASSERT(tp->t_dupacks == 1 || KASSERT(tp->t_dupacks == 1 ||
tp->t_dupacks == 2, tp->t_dupacks == 2,
("dupacks not 1 or 2")); ("dupacks not 1 or 2"));
if (tp->t_dupacks == 1) { if (tp->t_dupacks == 1)
tp->snd_limited = 0; tp->snd_limited = 0;
tp->snd_cwnd += tp->t_maxseg; tp->snd_cwnd =
} else { (tp->snd_nxt - tp->snd_una) +
tp->snd_cwnd += (tp->t_dupacks - tp->snd_limited) *
tp->t_maxseg * 2; tp->t_maxseg;
}
(void) tcp_output(tp); (void) tcp_output(tp);
sent = tp->snd_max - oldsndmax; sent = tp->snd_max - oldsndmax;
if (sent > tp->t_maxseg) { if (sent > tp->t_maxseg) {

11
sys/netinet/tcp_reass.c
View File

@ -1859,13 +1859,12 @@ tcp_input(m, off0)
KASSERT(tp->t_dupacks == 1 || KASSERT(tp->t_dupacks == 1 ||
tp->t_dupacks == 2, tp->t_dupacks == 2,
("dupacks not 1 or 2")); ("dupacks not 1 or 2"));
if (tp->t_dupacks == 1) { if (tp->t_dupacks == 1)
tp->snd_limited = 0; tp->snd_limited = 0;
tp->snd_cwnd += tp->t_maxseg; tp->snd_cwnd =
} else { (tp->snd_nxt - tp->snd_una) +
tp->snd_cwnd += (tp->t_dupacks - tp->snd_limited) *
tp->t_maxseg * 2; tp->t_maxseg;
}
(void) tcp_output(tp); (void) tcp_output(tp);
sent = tp->snd_max - oldsndmax; sent = tp->snd_max - oldsndmax;
if (sent > tp->t_maxseg) { if (sent > tp->t_maxseg) {