openvswitch: Fix pop_vlan action for double tagged frames
authorEric Garver <e@erig.me>
Wed, 20 Dec 2017 20:09:22 +0000 (15:09 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 19:31:10 +0000 (20:31 +0100)
commita6cc63e125ffb3ae9f6b4e2b4642ddea9a932b46
treef7f84e25c9553292c9f66cbc2b12886eb622965e
parentbf070305213031e1300070d10334ac012116d470
openvswitch: Fix pop_vlan action for double tagged frames

[ Upstream commit c48e74736fccf25fb32bb015426359e1c2016e3b ]

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: 5108bbaddc37 ("openvswitch: add processing of L3 packets")
Signed-off-by: Eric Garver <e@erig.me>
Reviewed-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/openvswitch/flow.c