Merge branch 'ovs-mpls'

Browse source

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>

...

This commit is contained in:

David S. Miller 2016-10-03 02:00:29 -04:00

parent ab58070569 85de4a2101

commit 32986b554a

4 changed files with 22 additions and 38 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

include/net/mpls.h

View file

10

net/mpls/internal.h

View file

24

net/openvswitch/actions.c

View file

11

net/openvswitch/flow.c

View file