diff options
| author | Jason Wang <jasowang@redhat.com> | 2013-07-16 07:36:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-16 22:01:57 +0200 |
| commit | 0fbe0d47b1ee2015c288abd4e7b32224f8bfa212 (patch) | |
| tree | aa267745771e6bdbe09e2200e1fda93b75bebbd1 /drivers | |
| parent | macvtap: fix the missing ret value of TUNSETQUEUE (diff) | |
| download | linux-0fbe0d47b1ee2015c288abd4e7b32224f8bfa212.tar.xz linux-0fbe0d47b1ee2015c288abd4e7b32224f8bfa212.zip | |
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: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/macvtap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 0e5492ec753a..a7c5654a2e5c 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -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); |