Merge branch 'mpls-next'

Browse source

Eric W. Biederman says:

====================
mpls: Minor fixes and cleanups

This is a bunch of small changes that have come out of the discussions
of the mpls code and the automated tests that people run against things.
====================

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

...

This commit is contained in:

David S. Miller 2015-03-08 19:30:31 -04:00

parent 008a5b07f1 b79bda3d38

commit 9b974499e4

4 changed files with 85 additions and 53 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

1

include/net/neighbour.h

View file

22

net/core/neighbour.c

View file

114

net/mpls/af_mpls.c

View file

1

net/openvswitch/Kconfig

View file