projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87566b4 1515aa7)
Merge branch 'ip6_tunnel-add-MPLS-support'
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 22:49:31 +0000 (15:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 22:49:31 +0000 (15:49 -0700)
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: David S. Miller <davem@davemloft.net>

Trivial merge