From: thuermann <thuermann@030b6a49-0b11-0410-94ab-b0dab22257f2>
Date: Mon, 22 Oct 2007 12:03:16 +0000 (+0000)
Subject: Use sock_alloc_send_skb() instead of alloc_skb() to allocate a socket buffer,
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/socketcan-devel.git/commitdiff_plain/99c8dc98c018ed6130a5926cde122062fcc33e8f

Use sock_alloc_send_skb() instead of alloc_skb() to allocate a socket buffer,
as suggested by Marc Klein-Budde.


git-svn-id: svn://svn.berlios.de//socketcan/trunk@532 030b6a49-0b11-0410-94ab-b0dab22257f2
---

diff --git a/kernel/2.6/net/can/raw.c b/kernel/2.6/net/can/raw.c
index fc55958..1707f00 100644
--- a/kernel/2.6/net/can/raw.c
+++ b/kernel/2.6/net/can/raw.c
@@ -728,10 +728,11 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
 		return -ENXIO;
 	}
 
-	skb = alloc_skb(size, GFP_KERNEL);
+	skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT,
+				  &err);
 	if (!skb) {
 		dev_put(dev);
-		return -ENOMEM;
+		return err;
 	}
 
 	err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);