diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2013-06-17 15:36:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-17 15:58:11 -0700 |
| commit | 93725cbd22ed716bea8dc479b4925d40a4dbd0c6 (patch) | |
| tree | c598fcb86140fded02aa0554bbb1fb0e5b5d6229 | |
| parent | 7aa27238417a34ec9be2d8eff05ceff319f2d39b (diff) | |
| download | olio-linux-3.10-93725cbd22ed716bea8dc479b4925d40a4dbd0c6.tar.xz olio-linux-3.10-93725cbd22ed716bea8dc479b4925d40a4dbd0c6.zip | |
Fix the VLAN_TAG_PRESENT in netvsc_recv_callback()
We should call __vlan_hwaccel_put_tag() only if the packet
comes from vlan, otherwise VLAN_TAG_PRESENT will always be
added.
Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index ab2307b5d9a..4dccead586b 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/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; |