From patchwork Fri Mar 5 04:01:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 46992 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9FEF1B7D03 for ; Fri, 5 Mar 2010 15:00:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754692Ab0CEEAd (ORCPT ); Thu, 4 Mar 2010 23:00:33 -0500 Received: from mga14.intel.com ([143.182.124.37]:33299 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752248Ab0CEEAa (ORCPT ); Thu, 4 Mar 2010 23:00:30 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 04 Mar 2010 20:00:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,585,1262592000"; d="scan'208";a="251111229" Received: from debian.sh.intel.com (HELO localhost.localdomain) ([10.239.13.113]) by azsmga001.ch.intel.com with ESMTP; 04 Mar 2010 20:00:28 -0800 From: Zhu Yi To: davem@davemloft.net Cc: netdev@vger.kernel.org, Zhu Yi , Jon Maloy , Allan Stephens Subject: [PATCH V3 6/8] tipc: use limited socket backlog Date: Fri, 5 Mar 2010 12:01:45 +0800 Message-Id: <1267761707-15605-6-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1267761707-15605-5-git-send-email-yi.zhu@intel.com> References: <1267761707-15605-1-git-send-email-yi.zhu@intel.com> <1267761707-15605-2-git-send-email-yi.zhu@intel.com> <1267761707-15605-3-git-send-email-yi.zhu@intel.com> <1267761707-15605-4-git-send-email-yi.zhu@intel.com> <1267761707-15605-5-git-send-email-yi.zhu@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make tipc adapt to the limited socket backlog change. Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Allan Stephens --- 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);