Skip to content
Commit df0651f8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ip6_tunnel-add-MPLS-support'



Vadim Fedorenko says:

====================
ip6_tunnel: add MPLS support

The support for MPLS-in-IPv4 was added earlier. This patchset adds
support for MPLS-in-IPv6.

Changes in v2:
- Eliminate ifdefs IS_ENABLE(CONFIG_MPLS)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 87566b44 1515aa70
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment