From cc7065d93e6c6d224803c14da2cef428ea6f0125 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 11 Jun 2009 20:55:17 -0700
Subject: [PATCH] --- yaml --- r: 150925 b: refs/heads/master c:
 8981f01001c616f58f1623ecadfab8b1ed758da7 h: refs/heads/master i:   150923:
 d93860e477d877729d00deb8a23aec214397414c 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 36a51d264296..f83542ae0b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adf76cfe24dab32a54e2dd1f51534cea8277f32a
+refs/heads/master: 8981f01001c616f58f1623ecadfab8b1ed758da7
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 09bd4410fa65..f0bb1a4c8323 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -283,10 +283,11 @@ static void try_fill_recv_maxbufs(struct virtnet_info *vi)
 	for (;;) {
 		struct virtio_net_hdr *hdr;
 
-		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN);
+		skb = netdev_alloc_skb(vi->dev, MAX_PACKET_LEN + NET_IP_ALIGN);
 		if (unlikely(!skb))
 			break;
 
+		skb_reserve(skb, NET_IP_ALIGN);
 		skb_put(skb, MAX_PACKET_LEN);
 
 		hdr = skb_vnet_hdr(skb);