diff options
| author | KY Srinivasan <kys@microsoft.com> | 2015-12-01 16:43:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-02 23:43:25 -0500 |
| commit | 760d1e36cc16fa6444dd2000ac645455de1ecd51 (patch) | |
| tree | b8b9f57c0ea7508309f5cb9f8ea6bc412557c8c2 /drivers/net/hyperv/rndis_filter.c | |
| parent | 10082f98878a9dff1563745f9f1dd9d1ff142700 (diff) | |
| download | op-kernel-dev-760d1e36cc16fa6444dd2000ac645455de1ecd51.zip op-kernel-dev-760d1e36cc16fa6444dd2000ac645455de1ecd51.tar.gz | |
hv_netvsc: Eliminate vlan_tci from struct hv_netvsc_packet
Eliminate vlan_tci from struct hv_netvsc_packet.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/rndis_filter.c')
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index 28adf6a..a37bbda 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c @@ -354,6 +354,7 @@ static int rndis_filter_receive_data(struct rndis_device *dev, u32 data_offset; struct ndis_pkt_8021q_info *vlan; struct ndis_tcp_ip_checksum_info *csum_info; + u16 vlan_tci = 0; rndis_pkt = &msg->msg.pkt; @@ -384,15 +385,13 @@ static int rndis_filter_receive_data(struct rndis_device *dev, vlan = rndis_get_ppi(rndis_pkt, IEEE_8021Q_INFO); if (vlan) { - pkt->vlan_tci = VLAN_TAG_PRESENT | vlan->vlanid | + vlan_tci = VLAN_TAG_PRESENT | vlan->vlanid | (vlan->pri << VLAN_PRIO_SHIFT); - } else { - pkt->vlan_tci = 0; } csum_info = rndis_get_ppi(rndis_pkt, TCPIP_CHKSUM_PKTINFO); return netvsc_recv_callback(dev->net_dev->dev, pkt, data, - csum_info, channel); + csum_info, channel, vlan_tci); } int rndis_filter_receive(struct hv_device *dev, |
