Martin Varghese d04ac224b1 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: 8822e270d6 ("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>		2019-12-04 17:11:25 -08:00
..
acpi
asm-generic	Merge branch 'akpm' (patches from Andrew)	2019-12-01 20:36:41 -08:00
clocksource
crypto
drm
dt-bindings	This merge window we have one small clk provider API in the core framework and	2019-12-01 16:06:02 -08:00
keys
kunit
kvm
linux	net: Fixed updating of ethertype in skb_mpls_push()	2019-12-04 17:11:25 -08:00
math-emu
media
misc
net	net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup	2019-12-04 12:27:13 -08:00
pcmcia
ras
rdma
scsi
soc
sound
target
trace	Merge branch 'akpm' (patches from Andrew)	2019-12-01 20:36:41 -08:00
uapi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid	2019-12-01 18:20:54 -08:00
vdso
video
xen
Kbuild