Merge branch 'ovs-mpls'
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Oct 2016 06:00:29 +0000 (02:00 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Oct 2016 06:00:29 +0000 (02:00 -0400)
commit32986b554a5bc673e3aeaded7acbe84ca362b3f3
treec93484e9f3001d3afb4c030eb632d2994b6b8b84
parentab580705693d5af79663efa504a72248700766fc
parent85de4a2101acb85c3b1dde465e84596ccca99f2c
Merge branch 'ovs-mpls'

Jiri Benc says:

====================
openvswitch: mpls fix and clean up

Convert to the new mpls skb layout the last remaining place in openvswitch,
forgotten on the mpls GSO rework. The GSO rework also allows for some
cleanup in the third patch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>