From 979857ad73f3dcf45c30d4e838fa4159ac269e62 Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Sun, 25 Jan 2009 18:06:26 -0800
Subject: [PATCH] --- yaml --- r: 130192 b: refs/heads/master c:
 e918085aaff34086e265f825dd469926b1aec4a4 h: refs/heads/master 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 5de050e2a858..64c0c39f9333 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 801599b0cd4c026a18fb9fce436eae4459f799a6
+refs/heads/master: e918085aaff34086e265f825dd469926b1aec4a4
diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c
index 43f6523c40be..63ef2a8905fb 100644
--- a/trunk/drivers/net/virtio_net.c
+++ b/trunk/drivers/net/virtio_net.c
@@ -24,6 +24,7 @@
 #include <linux/virtio.h>
 #include <linux/virtio_net.h>
 #include <linux/scatterlist.h>
+#include <linux/if_vlan.h>
 
 static int napi_weight = 128;
 module_param(napi_weight, int, 0444);
@@ -33,7 +34,7 @@ module_param(csum, bool, 0444);
 module_param(gso, bool, 0444);
 
 /* FIXME: MTU in config. */
-#define MAX_PACKET_LEN (ETH_HLEN+ETH_DATA_LEN)
+#define MAX_PACKET_LEN (ETH_HLEN + VLAN_HLEN + ETH_DATA_LEN)
 #define GOOD_COPY_LEN	128
 
 struct virtnet_info