diff options
| author | David S. Miller <[email protected]> | 2008-03-21 10:42:24 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2008-03-21 10:42:24 +0000 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /net/ipv4/tcp_output.c | |
| parent | [NET]: Add debugging names to __RW_LOCK_UNLOCKED macros. (diff) | |
| parent | [NET] ifb: set separate lockdep classes for queue locks (diff) | |
| download | kernel-a25606c845856e5ca5ed54d23cab077e3a49bf10.tar.gz kernel-a25606c845856e5ca5ed54d23cab077e3a49bf10.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 67f84f5035c4..b4e11d834c9f 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -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; |