aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-16 23:28:10 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-16 23:28:10 -0400
commit5c52ba170f8167511bdb65b981f4582100c40675 (patch)
tree1dab120003eb696dfb4ca18c40861274a317739d /net/ipv4
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/ipv4')
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 525dcf534153..bc8559a6f7e5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -316,7 +316,7 @@ int tcp_memory_pressure __read_mostly;
316 316
317EXPORT_SYMBOL(tcp_memory_pressure); 317EXPORT_SYMBOL(tcp_memory_pressure);
318 318
319void tcp_enter_memory_pressure(void) 319void tcp_enter_memory_pressure(struct sock *sk)
320{ 320{
321 if (!tcp_memory_pressure) { 321 if (!tcp_memory_pressure) {
322 NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES); 322 NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES);
@@ -649,7 +649,7 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)
649 } 649 }
650 __kfree_skb(skb); 650 __kfree_skb(skb);
651 } else { 651 } else {
652 sk->sk_prot->enter_memory_pressure(); 652 sk->sk_prot->enter_memory_pressure(sk);
653 sk_stream_moderate_sndbuf(sk); 653 sk_stream_moderate_sndbuf(sk);
654 } 654 }
655 return NULL; 655 return NULL;