Merge branch 'ip6_tunnel-add-MPLS-support'

Browse source

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>

...

This commit is contained in:

David S. Miller 2020-05-22 15:49:31 -07:00

parent 87566b446b 1515aa70c0

commit df0651f8c0

3 changed files with 228 additions and 109 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

247

net/ipv6/ip6_tunnel.c

View file

87

net/ipv6/tunnel6.c

View file

3

net/mpls/af_mpls.c

View file