Commit c48e7473 authored by Eric Garver's avatar Eric Garver Committed by David S. Miller
Browse files

openvswitch: Fix pop_vlan action for double tagged frames

skb_vlan_pop() expects skb->protocol to be a valid TPID for double
tagged frames. So set skb->protocol to the TPID and let skb_vlan_pop()
shift the true ethertype into position for us.

Fixes: 5108bbad

 ("openvswitch: add processing of L3 packets")
Signed-off-by: default avatarEric Garver <>
Reviewed-by: default avatarJiri Benc <>
Signed-off-by: default avatarDavid S. Miller <>
parent 58acfd71
......@@ -579,6 +579,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
return -EINVAL;
key->eth.type = skb->protocol;
} else {
eth = eth_hdr(skb);
ether_addr_copy(key->eth.src, eth->h_source);
......@@ -592,15 +593,23 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
if (unlikely(parse_vlan(skb, key)))
return -ENOMEM;
skb->protocol = parse_ethertype(skb);
if (unlikely(skb->protocol == htons(0)))
key->eth.type = parse_ethertype(skb);
if (unlikely(key->eth.type == htons(0)))
return -ENOMEM;
/* Multiple tagged packets need to retain TPID to satisfy
* skb_vlan_pop(), which will later shift the ethertype into
* skb->protocol.
if (key-> & htons(VLAN_TAG_PRESENT))
skb->protocol = key->eth.cvlan.tpid;
skb->protocol = key->eth.type;
__skb_push(skb, skb->data - skb_mac_header(skb));
key->eth.type = skb->protocol;
/* Network layer. */
if (key->eth.type == htons(ETH_P_IP)) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment