diff options
author | Eric Dumazet <edumazet@google.com> | 2012-04-22 19:34:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-23 22:28:28 -0400 |
commit | f545a38f74584cc7424cb74f792a00c6d2589485 (patch) | |
tree | b272cbfed3267a7750f55f23989e1b070ae6ac3e /net/ipv6/tcp_ipv6.c | |
parent | b98985073bc5403ef1320866e4ef8bbc5d587ceb (diff) |
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>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 8044f6ac1301..b04e6d8a8371 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1654,7 +1654,7 @@ process: | |||
1654 | if (!tcp_prequeue(sk, skb)) | 1654 | if (!tcp_prequeue(sk, skb)) |
1655 | ret = tcp_v6_do_rcv(sk, skb); | 1655 | ret = tcp_v6_do_rcv(sk, skb); |
1656 | } | 1656 | } |
1657 | } else if (unlikely(sk_add_backlog(sk, skb))) { | 1657 | } else if (unlikely(sk_add_backlog(sk, skb, sk->sk_rcvbuf))) { |
1658 | bh_unlock_sock(sk); | 1658 | bh_unlock_sock(sk); |
1659 | NET_INC_STATS_BH(net, LINUX_MIB_TCPBACKLOGDROP); | 1659 | NET_INC_STATS_BH(net, LINUX_MIB_TCPBACKLOGDROP); |
1660 | goto discard_and_relse; | 1660 | goto discard_and_relse; |