---

yaml --- r: 279489 b: refs/heads/master c: 3464645 h: refs/heads/master i: 279487: 53500ba v: v3
git-mirror · Jan 5, 2012 · 68a0027 · 68a0027
1 parent 558744b
commit 68a0027
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea81875ae07aeaca285afd2771425f771294c93c
+refs/heads/master: 3464645a10f80ce39bc90c5494a3e92387947818
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
@@ -156,6 +156,7 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page,
 	*len -= size;
 }
 
+/* Called from bottom half context */
 static struct sk_buff *page_to_skb(struct virtnet_info *vi,
 				   struct page *page, unsigned int len)
 {
@@ -358,7 +359,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp)
 	struct skb_vnet_hdr *hdr;
 	int err;
 
-	skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN);
+	skb = __netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN, gfp);
 	if (unlikely(!skb))
 		return -ENOMEM;