diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-22 15:49:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-22 15:49:31 -0700 |
| commit | df0651f8c0cc29603598f1de99426fd862365fc2 (patch) | |
| tree | ba8239f128711161333a10701f5b162642d14311 /net/core | |
| parent | 87566b446b77fdd20a36832511a70ffe3227091e (diff) | |
| parent | 1515aa70c04151676a7dfefecfcf1d36ff52bc67 (diff) | |
| download | linux-df0651f8c0cc29603598f1de99426fd862365fc2.tar.bz2 | |
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>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions