net/hyperv: use skb_vlan_tag_*() helpers

Replace open-coded bitfield manipulation with skb_vlan_tag_*() helpers.
This also enables correctly passing of VLAN.CFI bit.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index cf36e7ff31919850ee829819f3e02d39bb99d794..85936ed9e9525913b39f58d7a61b63b8a228fc5f 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -605,9 +605,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                                     IEEE_8021Q_INFO);
 
                vlan->value = 0;
-               vlan->vlanid = skb->vlan_tci & VLAN_VID_MASK;
-               vlan->pri = (skb->vlan_tci & VLAN_PRIO_MASK) >>
-                               VLAN_PRIO_SHIFT;
+               vlan->vlanid = skb_vlan_tag_get_id(skb);
+               vlan->cfi = skb_vlan_tag_get_cfi(skb);
+               vlan->pri = skb_vlan_tag_get_prio(skb);
        }
 
        if (skb_is_gso(skb)) {
@@ -781,7 +781,8 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net,
        }
 
        if (vlan) {
-               u16 vlan_tci = vlan->vlanid | (vlan->pri << VLAN_PRIO_SHIFT);
+               u16 vlan_tci = vlan->vlanid | (vlan->pri << VLAN_PRIO_SHIFT) |
+                       (vlan->cfi ? VLAN_CFI_MASK : 0);
 
                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
                                       vlan_tci);