forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse source
This commit is contained in:
David S. Miller 2008-03-21 03:42:24 -07:00
commit a25606c845
14 changed files with 152 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/tcp_output.c
View file

@ -255,7 +255,7 @@ static u16 tcp_select_window(struct sock *sk)
*
* Relax Will Robinson.
*/
new_win = cur_win;
new_win = ALIGN(cur_win, 1 << tp->rx_opt.rcv_wscale);
}
tp->rcv_wnd = new_win;
tp->rcv_wup = tp->rcv_nxt;