net/hyperv: use skb_vlan_tag_*() helpers (98ba780e) · Commits · 戴 / test

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

drivers/net/hyperv/netvsc_drv.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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);