x25: use limited socket backlog
authorZhu Yi <yi.zhu@intel.com>
Thu, 4 Mar 2010 18:01:46 +0000 (18:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Mar 2010 21:34:02 +0000 (13:34 -0800)
Make x25 adapt to the limited socket backlog change.

Cc: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/x25/x25_dev.c

index 3e1efe53464598b6040fb046a6a073b9622d7122..a9da0dc26f4fad2a2be6d590f8d2e1d49e063bc8 100644 (file)
@@ -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);