From 129acc1720ec3e0a1b2b30b1318138ba47afefa3 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 4 Mar 2010 18:01:46 +0000
Subject: [PATCH] --- yaml --- r: 187942 b: refs/heads/master c:
 2499849ee8f513e795b9f2c19a42d6356e4943a4 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/x25/x25_dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ebc0a40769ff..3f6a88c501ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53eecb1be5ae499d399d2923933937a9ea1a284f
+refs/heads/master: 2499849ee8f513e795b9f2c19a42d6356e4943a4
diff --git a/trunk/net/x25/x25_dev.c b/trunk/net/x25/x25_dev.c
index 3e1efe534645..a9da0dc26f4f 100644
--- a/trunk/net/x25/x25_dev.c
+++ b/trunk/net/x25/x25_dev.c
@@ -53,7 +53,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
 		if (!sock_owned_by_user(sk)) {
 			queued = x25_process_rx_frame(sk, skb);
 		} else {
-			sk_add_backlog(sk, skb);
+			queued = !sk_add_backlog_limited(sk, skb);
 		}
 		bh_unlock_sock(sk);
 		sock_put(sk);