---

yaml --- r: 187942 b: refs/heads/master c: 2499849 h: refs/heads/master v: v3
git-mirror · Mar 5, 2010 · 129acc1 · 129acc1
1 parent e88cecb
commit 129acc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);