Patchwork [7/8] tipc: use limited socket backlog

login
register
mail settings
Submitter Zhu Yi
Date March 3, 2010, 6:35 a.m.
Message ID <1267598111-12503-7-git-send-email-yi.zhu@intel.com>
Download mbox | patch
Permalink /patch/46765/
State Superseded
Delegated to: David Miller
Headers show

Comments

Zhu Yi - March 3, 2010, 6:35 a.m.
Make tipc adapt to the limited socket backlog change.

Cc: Per Liden <per.liden@ericsson.com>
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(-)

Patch

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1ea64f0..4b235fc 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(sk, buf))
+			res = TIPC_ERR_OVERLOAD;
+		else
+			res = TIPC_OK;
 	}
 	bh_unlock_sock(sk);