From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch 7/8 2.6.32] llc: use limited socket backlog Date: Sun, 13 Nov 2011 23:19:35 +0300 Message-ID: <20111113201935.GH1362@elgon.mountain> References: <20111113201336.GA1362@elgon.mountain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Greg Kroah-Hartman , Zhu Yi , netdev@vger.kernel.org, Eric Dumazet To: stable@vger.kernel.org Return-path: Received: from acsinet15.oracle.com ([141.146.126.227]:28018 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752764Ab1KMUTy (ORCPT ); Sun, 13 Nov 2011 15:19:54 -0500 Content-Disposition: inline In-Reply-To: <20111113201336.GA1362@elgon.mountain> Sender: netdev-owner@vger.kernel.org List-ID: This applied without changes to the original patch. >>From 79545b681961d7001c1f4c3eb9ffb87bed4485db Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 4 Mar 2010 18:01:43 +0000 Subject: [PATCH] llc: use limited socket backlog Make llc adapt to the limited socket backlog change. Cc: Arnaldo Carvalho de Melo Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller Signed-off-by: Dan Carpenter --- net/llc/llc_conn.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index a8dde9b..c0539ff 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c @@ -827,7 +827,8 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb) else { dprintk("%s: adding to backlog...\n", __func__); llc_set_backlog_type(skb, LLC_PACKET); - sk_add_backlog(sk, skb); + if (sk_add_backlog_limited(sk, skb)) + goto drop_unlock; } out: bh_unlock_sock(sk); -- 1.7.8.rc0.dirty