netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zhu Yi <yi.zhu@intel.com>
To: netdev@vger.kernel.org
Cc: Zhu Yi <yi.zhu@intel.com>, Jon Maloy <jon.maloy@ericsson.com>,
	Allan Stephens <allan.stephens@windriver.com>
Subject: [PATCH V2 6/7] tipc: use limited socket backlog
Date: Wed,  3 Mar 2010 16:36:28 +0800	[thread overview]
Message-ID: <1267605389-7369-6-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1267605389-7369-5-git-send-email-yi.zhu@intel.com>

Make tipc adapt to the limited socket backlog change.

Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
 net/tipc/socket.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1ea64f0..22bfbc3 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1322,8 +1322,10 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
 	if (!sock_owned_by_user(sk)) {
 		res = filter_rcv(sk, buf);
 	} else {
-		sk_add_backlog(sk, buf);
-		res = TIPC_OK;
+		if (sk_add_backlog_limited(sk, buf))
+			res = TIPC_ERR_OVERLOAD;
+		else
+			res = TIPC_OK;
 	}
 	bh_unlock_sock(sk);
 
-- 
1.6.3.3


  reply	other threads:[~2010-03-03  8:34 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-03  8:36 [PATCH V2 1/7] net: add limit for socket backlog Zhu Yi
2010-03-03  8:36 ` [PATCH V2 2/7] tcp: use limited " Zhu Yi
2010-03-03  8:36   ` [PATCH V2 3/7] udp: " Zhu Yi
     [not found]     ` <1267605389-7369-4-git-send-email-yi.zhu@intel.com>
2010-03-03  8:36       ` [PATCH V2 5/7] sctp: " Zhu Yi
2010-03-03  8:36         ` Zhu Yi [this message]
2010-03-03  8:36           ` [PATCH V2 7/7] net: backlog functions rename Zhu Yi
2010-03-03 14:10         ` [PATCH V2 5/7] sctp: use limited socket backlog Vlad Yasevich
2010-03-03 14:19           ` Zhu, Yi
2010-03-03 14:36             ` Vlad Yasevich
2010-03-04  2:00               ` Zhu, Yi
2010-03-03  8:53   ` [PATCH V2 2/7] tcp: " Eric Dumazet
2010-03-03  9:06     ` Zhu Yi
2010-03-03 10:07       ` Eric Dumazet
2010-03-03 14:12         ` Zhu, Yi
2010-03-03 14:31           ` Eric Dumazet
2010-03-04  5:21             ` Zhu, Yi
2010-03-04  6:00               ` Eric Dumazet
2010-03-04 11:04                 ` Zhu, Yi
2010-03-04 14:56                   ` Eric Dumazet
2010-03-03  8:54 ` [PATCH V2 1/7] net: add limit for " David Miller
2010-03-03  9:01   ` Zhu Yi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1267605389-7369-6-git-send-email-yi.zhu@intel.com \
    --to=yi.zhu@intel.com \
    --cc=allan.stephens@windriver.com \
    --cc=jon.maloy@ericsson.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).