net: add a limit parameter to sk_add_backlog()

sk_add_backlog() & sk_rcvqueues_full() hard coded sk_rcvbuf as the
memory limit. We need to make this limit a parameter for TCP use.

No functional change expected in this patch, all callers still using the
old sk_rcvbuf limit.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Tom Herbert <therbert@google.com>
Cc: Maciej Żenczykowski <maze@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 37b0699e95e5..d39bbc9e0622 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -611,14 +611,14 @@ static void flush_stack(struct sock **stack, unsigned int count,
 
                 sk = stack[i];
                 if (skb1) {
-                        if (sk_rcvqueues_full(sk, skb1)) {
+                        if (sk_rcvqueues_full(sk, skb1, sk->sk_rcvbuf)) {
                                 kfree_skb(skb1);
                                 goto drop;
                         }
                         bh_lock_sock(sk);
                         if (!sock_owned_by_user(sk))
                                 udpv6_queue_rcv_skb(sk, skb1);
-                        else if (sk_add_backlog(sk, skb1)) {
+                        else if (sk_add_backlog(sk, skb1, sk->sk_rcvbuf)) {
                                 kfree_skb(skb1);
                                 bh_unlock_sock(sk);
                                 goto drop;
@@ -790,14 +790,14 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
 
         /* deliver */
 
-        if (sk_rcvqueues_full(sk, skb)) {
+        if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
                 sock_put(sk);
                 goto discard;
         }
         bh_lock_sock(sk);
         if (!sock_owned_by_user(sk))
                 udpv6_queue_rcv_skb(sk, skb);
-        else if (sk_add_backlog(sk, skb)) {
+        else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
                 atomic_inc(&sk->sk_drops);
                 bh_unlock_sock(sk);
                 sock_put(sk);