From 68a0027018352407b0a95b9b1f1c7e0eb9d4b9f6 Mon Sep 17 00:00:00 2001
From: Mike Waychison <mikew@google.com>
Date: Wed, 4 Jan 2012 12:52:32 +0000
Subject: [PATCH] --- yaml --- r: 279489 b: refs/heads/master c:
 3464645a10f80ce39bc90c5494a3e92387947818 h: refs/heads/master i:   279487:
 53500ba5c9bd9989478d723814d4e0f4100cecac v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/virtio_net.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f8e1ef80a4a..37b4c096108f 100644
--- 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
index 2055386eda58..76fe14efb2b5 100644
--- 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;