diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-06-23 20:01:15 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-06-23 20:01:15 -0300 |
| commit | 50bde7d0f69bbdf0b90baf198620bb838eb5cc74 (patch) | |
| tree | 2c440c5d61618119d0da1d4528a070fbed3a8136 /net/ipv4/tcp_timer.c | |
| parent | fdf12225556ebee8cb881414f98ce228b4d096ce (diff) | |
[NET] make the struct proto entries related to memory pressure be pointers
This is needed because tcpv6_prot has to point to the same place tcp_prot points,
as they share the same accounting variables.
This fixes a bug noticed by David Miller when using the ipv6_mapped functionality,
thanks David!
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 876f9f410277..840f621886c8 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -113,7 +113,7 @@ static int tcp_out_of_resources(struct sock *sk, int do_reset) if (orphans >= sysctl_tcp_max_orphans || (sk->sk_wmem_queued > SOCK_MIN_SNDBUF && - atomic_read(&tcp_prot.memory_allocated) > tcp_prot.sysctl_mem[2])) { + atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])) { if (net_ratelimit()) printk(KERN_INFO "Out of socket memory\n"); |