diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/sock.c | 2 | ||||
-rw-r--r-- | net/decnet/af_decnet.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 4 | ||||
-rw-r--r-- | net/sctp/socket.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 2c0ba52e5303..10a64d57078c 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) | |||
1442 | /* Under pressure. */ | 1442 | /* Under pressure. */ |
1443 | if (allocated > prot->sysctl_mem[1]) | 1443 | if (allocated > prot->sysctl_mem[1]) |
1444 | if (prot->enter_memory_pressure) | 1444 | if (prot->enter_memory_pressure) |
1445 | prot->enter_memory_pressure(); | 1445 | prot->enter_memory_pressure(sk); |
1446 | 1446 | ||
1447 | /* Over hard limit. */ | 1447 | /* Over hard limit. */ |
1448 | if (allocated > prot->sysctl_mem[2]) | 1448 | if (allocated > prot->sysctl_mem[2]) |
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 931bdf9cb756..61b7df577ddd 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -451,7 +451,7 @@ static void dn_destruct(struct sock *sk) | |||
451 | 451 | ||
452 | static int dn_memory_pressure; | 452 | static int dn_memory_pressure; |
453 | 453 | ||
454 | static void dn_enter_memory_pressure(void) | 454 | static void dn_enter_memory_pressure(struct sock *sk) |
455 | { | 455 | { |
456 | if (!dn_memory_pressure) { | 456 | if (!dn_memory_pressure) { |
457 | dn_memory_pressure = 1; | 457 | dn_memory_pressure = 1; |
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 | ||
317 | EXPORT_SYMBOL(tcp_memory_pressure); | 317 | EXPORT_SYMBOL(tcp_memory_pressure); |
318 | 318 | ||
319 | void tcp_enter_memory_pressure(void) | 319 | void 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; |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index df5572c39f0c..6aba01b0ce4e 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -116,7 +116,7 @@ static int sctp_memory_pressure; | |||
116 | static atomic_t sctp_memory_allocated; | 116 | static atomic_t sctp_memory_allocated; |
117 | static atomic_t sctp_sockets_allocated; | 117 | static atomic_t sctp_sockets_allocated; |
118 | 118 | ||
119 | static void sctp_enter_memory_pressure(void) | 119 | static void sctp_enter_memory_pressure(struct sock *sk) |
120 | { | 120 | { |
121 | sctp_memory_pressure = 1; | 121 | sctp_memory_pressure = 1; |
122 | } | 122 | } |