]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d27a8a6 b2495dc)
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)
commit33dd7a0f195f32b2b14ff84ede58059b10e3a796
treeba8239f128711161333a10701f5b162642d14311tree | snapshot
parentd27a8a6d2fce1522c7e06843d6543fea60c0494bcommit | diff
parentb2495dce4d4be0d6d38a5947b4d5e7525f0a411dcommit | diff
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: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.