diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /net/ipv4/tcp_input.c | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 |
