Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b03a53a authored Mar 04, 2010 by Zhu Yi Committed by David S. Miller Mar 05, 2010

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>

parent 8eae939f

net/ipv4/tcp_ipv4.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1682,8 +1682,10 @@ int tcp_v4_rcv(struct sk_buff *skb)
		if (!tcp_prequeue(sk, skb))
		ret = tcp_v4_do_rcv(sk, skb);
		}
		} else
		sk_add_backlog(sk, skb);
		} else if (sk_add_backlog_limited(sk, skb)) {
		bh_unlock_sock(sk);
		goto discard_and_relse;
		}
		bh_unlock_sock(sk);

		sock_put(sk);

net/ipv6/tcp_ipv6.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1740,8 +1740,10 @@ static int tcp_v6_rcv(struct sk_buff *skb)
		if (!tcp_prequeue(sk, skb))
		ret = tcp_v6_do_rcv(sk, skb);
		}
		} else
		sk_add_backlog(sk, skb);
		} else if (sk_add_backlog_limited(sk, skb)) {
		bh_unlock_sock(sk);
		goto discard_and_relse;
		}
		bh_unlock_sock(sk);

		sock_put(sk);