diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
| commit | fab8d6ddf6dee2608869005d45fe97f70e4f5bdd (patch) | |
| tree | fecf566e03a87b2a44c7f3363ddb5c0d4bebdca7 /net/ipv4/tcp_input.c | |
| parent | 64419d93a5906600af5817ad0cae3c6ecf7fb389 (diff) | |
| parent | f52ee1410d563cd409b08822492273a5bc235821 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index a97ed5416c28..e9a54ae7d690 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -456,7 +456,8 @@ void tcp_rcv_space_adjust(struct sock *sk) | |||
| 456 | 456 | ||
| 457 | tp->rcvq_space.space = space; | 457 | tp->rcvq_space.space = space; |
| 458 | 458 | ||
| 459 | if (sysctl_tcp_moderate_rcvbuf) { | 459 | if (sysctl_tcp_moderate_rcvbuf && |
| 460 | !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) { | ||
| 460 | int new_clamp = space; | 461 | int new_clamp = space; |
| 461 | 462 | ||
| 462 | /* Receive space grows, normalize in order to | 463 | /* Receive space grows, normalize in order to |