From 0dd7aa9b2bfba4e6921b220d55444dcf919815f8 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 4 Mar 2010 18:01:43 +0000
Subject: [PATCH] --- yaml --- r: 187939 b: refs/heads/master c:
 79545b681961d7001c1f4c3eb9ffb87bed4485db h: refs/heads/master i:   187937:
 0f4ea372a982acf66f00a9c2df3e4e239c460624   187935:
 53c2a20627082a40cd0f98422a99f72c4f892c8f v: v3

---
 [refs]                   | 2 +-
 trunk/net/llc/llc_conn.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad8379bc6d97..0af10eb1918a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55349790d7cbf0d381873a7ece1dcafcffd4aaa9
+refs/heads/master: 79545b681961d7001c1f4c3eb9ffb87bed4485db
diff --git a/trunk/net/llc/llc_conn.c b/trunk/net/llc/llc_conn.c
index a8dde9b010da..c0539ffdb272 100644
--- a/trunk/net/llc/llc_conn.c
+++ b/trunk/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);