---

yaml --- r: 377375 b: refs/heads/master c: 93725cb h: refs/heads/master i: 377373: fb67212 377371: bc3bea4 377367: d5fd7e9 377359: 4f56710 377343: a291cd0 v: v3
git-mirror · Jun 17, 2013 · 1fb4f79 · 1fb4f79
1 parent 55ae52e
commit 1fb4f79
Show file tree

Hide file tree

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