From 91f154f6f464d3354c9cd5c9b538ddeab4bca80f Mon Sep 17 00:00:00 2001
From: Basil Gor <basil.gor@gmail.com>
Date: Thu, 3 May 2012 22:55:23 +0000
Subject: [PATCH] --- yaml --- r: 300209 b: refs/heads/master c:
 c53cff5e42a06b81495983bd01741b9a954f11f0 h: refs/heads/master i:   300207:
 ac46d38b1fbd04e7bcee6fd076227a1d67115c15 v: v3

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

diff --git a/[refs] b/[refs]
index 3dc30dd75d99..5ccf47451079 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13a8e0c8cdb43982372bd6c65fb26839c8fd8ce9
+refs/heads/master: c53cff5e42a06b81495983bd01741b9a954f11f0
diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c
index 1f21d2a1e528..5c170100de9c 100644
--- a/trunk/drivers/vhost/net.c
+++ b/trunk/drivers/vhost/net.c
@@ -24,6 +24,7 @@
 #include <linux/if_arp.h>
 #include <linux/if_tun.h>
 #include <linux/if_macvlan.h>
+#include <linux/if_vlan.h>
 
 #include <net/sock.h>
 
@@ -283,8 +284,12 @@ static int peek_head_len(struct sock *sk)
 
 	spin_lock_irqsave(&sk->sk_receive_queue.lock, flags);
 	head = skb_peek(&sk->sk_receive_queue);
-	if (likely(head))
+	if (likely(head)) {
 		len = head->len;
+		if (vlan_tx_tag_present(head))
+			len += VLAN_HLEN;
+	}
+
 	spin_unlock_irqrestore(&sk->sk_receive_queue.lock, flags);
 	return len;
 }