Prev: [043/156] ALSA: cmipci: work around invalid PCM pointer
Next: [094/156] nilfs2: fix hang-up of cleaner after log writer returned with error
From: Greg KH on 30 Mar 2010 19:40
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Zhu Yi <yi.zhu(a)intel.com>

[ Upstream commit 2499849ee8f513e795b9f2c19a42d6356e4943a4 ]

Make x25 adapt to the limited socket backlog change.

Cc: Andrew Hendry <andrew.hendry(a)gmail.com>
Signed-off-by: Zhu Yi <yi.zhu(a)intel.com>
Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
net/x25/x25_dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -53,7 +53,7 @@ static int x25_receive_data(struct sk_bu
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);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [043/156] ALSA: cmipci: work around invalid PCM pointer
Next: [094/156] nilfs2: fix hang-up of cleaner after log writer returned with error