From 1fb4f794007dabcfc3d5334f83e9f6c984b918ff Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon, 17 Jun 2013 15:36:49 -0700
Subject: [PATCH] --- yaml --- r: 377375 b: refs/heads/master c:
 93725cbd22ed716bea8dc479b4925d40a4dbd0c6 h: refs/heads/master i:   377373:
 fb67212b06cd902375c7566bdbdb19fa79a0714a   377371:
 bc3bea4c25b5293f189eff577cf73dcc9c5230aa   377367:
 d5fd7e9e9a91b27f70c3d56899aef2f0e37227e1   377359:
 4f56710ef9c53ff7f9fd7367c18545ff866148b3   377343:
 a291cd0321748f54cf3f1ef24554ef3d0ecead1c v: v3

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

diff --git a/[refs] b/[refs]
index 8ed0e61339ff..9ee7e4cdc7d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7aa27238417a34ec9be2d8eff05ceff319f2d39b
+refs/heads/master: 93725cbd22ed716bea8dc479b4925d40a4dbd0c6
diff --git a/trunk/drivers/net/hyperv/netvsc_drv.c b/trunk/drivers/net/hyperv/netvsc_drv.c
index ab2307b5d9a7..4dccead586be 100644
--- a/trunk/drivers/net/hyperv/netvsc_drv.c
+++ b/trunk/drivers/net/hyperv/netvsc_drv.c
@@ -285,7 +285,9 @@ int netvsc_recv_callback(struct hv_device *device_obj,
 
 	skb->protocol = eth_type_trans(skb, net);
 	skb->ip_summed = CHECKSUM_NONE;
-	__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), packet->vlan_tci);
+	if (packet->vlan_tci & VLAN_TAG_PRESENT)
+		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+				       packet->vlan_tci);
 
 	net->stats.rx_packets++;
 	net->stats.rx_bytes += packet->total_data_buflen;