Commit 0fbe0d47 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

macvtap: do not assume 802.1Q when send vlan packets 



The hard-coded 8021.q proto will break 802.1ad traffic. So switch to use
vlan->proto.

Cc: Basil Gor <basil.gor@gmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82a19eb8

drivers/net/macvtap.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, 
			__be16 h_vlan_proto;

			__be16 h_vlan_TCI;

		} veth;

		veth.h_vlan_proto = htons(ETH_P_8021Q);

		veth.h_vlan_proto = skb->vlan_proto;

		veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));



		vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);