diff options
| author | Zhu Yi <yi.zhu@intel.com> | 2010-03-04 18:01:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 16:02:04 -0700 |
| commit | 51c5db4ddd330e96c9221392b1cf361ce1daa88c (patch) | |
| tree | c5060cd7a7dea2d1807bc17edfead8df87c50c61 /net | |
| parent | c531ab23d0b83b6018c5f137c4093771267f505b (diff) | |
| download | kernel-crypto-51c5db4ddd330e96c9221392b1cf361ce1daa88c.tar.gz kernel-crypto-51c5db4ddd330e96c9221392b1cf361ce1daa88c.tar.xz kernel-crypto-51c5db4ddd330e96c9221392b1cf361ce1daa88c.zip | |
x25: use limited socket backlog
[ Upstream commit 2499849ee8f513e795b9f2c19a42d6356e4943a4 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/x25/x25_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index 3e1efe53464..a9da0dc26f4 100644 --- a/net/x25/x25_dev.c +++ b/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); |