Merge branch 'drm-ttm-unmappable' into drm-core-next

[pandora-kernel.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 3e1efe5..b9ef682 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/if_arp.h>
 #include <net/x25.h>
@@ -53,7 +54,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(sk, skb);
                }
                bh_unlock_sock(sk);
                sock_put(sk);