diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 06:42:24 -0400 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /net/ipv4/tcp_output.c | |
| parent | 938b93adb2642885e688390396472d22a7548748 (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
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) | |||
| 255 | * | 255 | * |
| 256 | * Relax Will Robinson. | 256 | * Relax Will Robinson. |
| 257 | */ | 257 | */ |
| 258 | new_win = cur_win; | 258 | new_win = ALIGN(cur_win, 1 << tp->rx_opt.rcv_wscale); |
| 259 | } | 259 | } |
| 260 | tp->rcv_wnd = new_win; | 260 | tp->rcv_wnd = new_win; |
| 261 | tp->rcv_wup = tp->rcv_nxt; | 261 | tp->rcv_wup = tp->rcv_nxt; |