path: root/net/core/sock.c
diff options
authorPavel Emelyanov <xemul@openvz.org>2008-07-16 20:28:10 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-16 20:28:10 -0700
commit5c52ba170f8167511bdb65b981f4582100c40675 (patch)
tree1dab120003eb696dfb4ca18c40861274a317739d /net/core/sock.c
parentcf1100a7a4f2573f50f9a923b53373977328e3c8 (diff)
sock: add net to prot->enter_memory_pressure callback
The tcp_enter_memory_pressure calls NET_INC_STATS, but doesn't have where to get the net from. I decided to add a sk argument, not the net itself, only to factor all the required sock_net(sk) calls inside the enter_memory_pressure callback itself. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 2c0ba52e530..10a64d57078 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1442,7 +1442,7 @@ int __sk_mem_schedule(struct sock *sk, int size, int kind)
/* Under pressure. */
if (allocated > prot->sysctl_mem[1])
if (prot->enter_memory_pressure)
- prot->enter_memory_pressure();
+ prot->enter_memory_pressure(sk);
/* Over hard limit. */
if (allocated > prot->sysctl_mem[2])