---

yaml --- r: 300209 b: refs/heads/master c: c53cff5 h: refs/heads/master i: 300207: ac46d38 v: v3
git-mirror · May 11, 2012 · 91f154f · 91f154f
1 parent c3cabdf
commit 91f154f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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;
 }