diff options
author | David S. Miller <davem@davemloft.net> | 2015-04-22 21:24:55 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-22 21:24:55 +0300 |
commit | 0e2d686530d5e6c3c50c2c4f9ef8d6428252c35c (patch) | |
tree | e18ac4586481309da81bc43a30f3677e46a38858 /net/ipv6/ip6_gre.c | |
parent | 909d9faae2a447110aa061070145297fffe129cb (diff) | |
parent | 5a9ab0176198d91dfc153f5e6c5fdc5afa613607 (diff) | |
download | linux-0e2d686530d5e6c3c50c2c4f9ef8d6428252c35c.tar.xz |
Merge branch 'mpls'
Robert Shearman says:
====================
mpls: ABI changes for security and correctness
V2:
- don't treat loopback interfaces specially by enabling mpls by
default
These changes make mpls not be enabled by default on all
interfaces when in use for security, along with ensuring that a label
not valid as an outgoing label can be added in mpls routes.
This series contains three ABI/behaviour-affecting changes which have
been split out from "[PATCH net-next v4 0/6] mpls: Behaviour-changing
improvements" without any further modification. These changes need to
be considered for 4.1 otherwise we'll be stuck with the current
behaviour/ABI forever.
====================
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
0 files changed, 0 insertions, 0 deletions