diff options
author | Zhu Yi <yi.zhu@intel.com> | 2010-03-04 13:01:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-05 16:34:00 -0500 |
commit | 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 (patch) | |
tree | e16e367dd5365c707ecc7373c593da4922d6c8d6 /net/ipv4/tcp_ipv4.c | |
parent | 8eae939f1400326b06d0c9afe53d2a484a326871 (diff) |
tcp: use limited socket backlog
Make tcp adapt to the limited socket backlog change.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c3588b4fd979..4baf1943b1bd 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1682,8 +1682,10 @@ process: | |||
1682 | if (!tcp_prequeue(sk, skb)) | 1682 | if (!tcp_prequeue(sk, skb)) |
1683 | ret = tcp_v4_do_rcv(sk, skb); | 1683 | ret = tcp_v4_do_rcv(sk, skb); |
1684 | } | 1684 | } |
1685 | } else | 1685 | } else if (sk_add_backlog_limited(sk, skb)) { |
1686 | sk_add_backlog(sk, skb); | 1686 | bh_unlock_sock(sk); |
1687 | goto discard_and_relse; | ||
1688 | } | ||
1687 | bh_unlock_sock(sk); | 1689 | bh_unlock_sock(sk); |
1688 | 1690 | ||
1689 | sock_put(sk); | 1691 | sock_put(sk); |