diff options
Diffstat (limited to 'drivers/net/macvtap.c')
-rw-r--r-- | drivers/net/macvtap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 919f4fccc322..e40fdfccc9c1 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -642,7 +642,7 @@ static void macvtap_skb_to_vnet_hdr(struct macvtap_queue *q, | |||
642 | 642 | ||
643 | if (skb->ip_summed == CHECKSUM_PARTIAL) { | 643 | if (skb->ip_summed == CHECKSUM_PARTIAL) { |
644 | vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; | 644 | vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; |
645 | if (vlan_tx_tag_present(skb)) | 645 | if (skb_vlan_tag_present(skb)) |
646 | vnet_hdr->csum_start = cpu_to_macvtap16(q, | 646 | vnet_hdr->csum_start = cpu_to_macvtap16(q, |
647 | skb_checksum_start_offset(skb) + VLAN_HLEN); | 647 | skb_checksum_start_offset(skb) + VLAN_HLEN); |
648 | else | 648 | else |
@@ -818,13 +818,13 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, | |||
818 | total = vnet_hdr_len; | 818 | total = vnet_hdr_len; |
819 | total += skb->len; | 819 | total += skb->len; |
820 | 820 | ||
821 | if (vlan_tx_tag_present(skb)) { | 821 | if (skb_vlan_tag_present(skb)) { |
822 | struct { | 822 | struct { |
823 | __be16 h_vlan_proto; | 823 | __be16 h_vlan_proto; |
824 | __be16 h_vlan_TCI; | 824 | __be16 h_vlan_TCI; |
825 | } veth; | 825 | } veth; |
826 | veth.h_vlan_proto = skb->vlan_proto; | 826 | veth.h_vlan_proto = skb->vlan_proto; |
827 | veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb)); | 827 | veth.h_vlan_TCI = htons(skb_vlan_tag_get(skb)); |
828 | 828 | ||
829 | vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto); | 829 | vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto); |
830 | total += VLAN_HLEN; | 830 | total += VLAN_HLEN; |