net: Fixed updating of ethertype in skb_mpls_push()
authorMartin Varghese <martin.varghese@nokia.com>
Thu, 5 Dec 2019 00:27:22 +0000 (05:57 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Dec 2019 01:11:25 +0000 (17:11 -0800)
commitd04ac224b1688f005a84f764cfe29844f8e9da08
tree5cfc5f7aa731b446d53c6f429409c9a2c98c0145
parent099ffd7eddfe03b9b5b43e1f4ffece99121dd7ba
net: Fixed updating of ethertype in skb_mpls_push()

The skb_mpls_push was not updating ethertype of an ethernet packet if
the packet was originally received from a non ARPHRD_ETHER device.

In the below OVS data path flow, since the device corresponding to
port 7 is an l3 device (ARPHRD_NONE) the skb_mpls_push function does
not update the ethertype of the packet even though the previous
push_eth action had added an ethernet header to the packet.

recirc_id(0),in_port(7),eth_type(0x0800),ipv4(tos=0/0xfc,ttl=64,frag=no),
actions:push_eth(src=00:00:00:00:00:00,dst=00:00:00:00:00:00),
push_mpls(label=13,tc=0,ttl=64,bos=1,eth_type=0x8847),4

Fixes: 8822e270d697 ("net: core: move push MPLS functionality from OvS to core helper")
Signed-off-by: Martin Varghese <martin.varghese@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/skbuff.h
net/core/skbuff.c
net/openvswitch/actions.c
net/sched/act_mpls.c