summaryrefslogtreecommitdiffstats
path: root/net/mpls
diff options
context:
space:
mode:
authorVadim Fedorenko <vfedorenko@novek.ru>2020-05-20 17:21:39 +0200
committerDavid S. Miller <davem@davemloft.net>2020-05-23 00:49:31 +0200
commit1515aa70c04151676a7dfefecfcf1d36ff52bc67 (patch)
treeba8239f128711161333a10701f5b162642d14311 /net/mpls
parentip6_tunnel: add generic MPLS receive support (diff)
downloadlinux-1515aa70c04151676a7dfefecfcf1d36ff52bc67.tar.xz
linux-1515aa70c04151676a7dfefecfcf1d36ff52bc67.zip
mpls: Add support for IPv6 tunnels
Add support for IPv6 tunnel devices in AF_MPLS. Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
-rw-r--r--net/mpls/af_mpls.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index a42e4ed5ab0e..fd30ea61336e 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1593,7 +1593,8 @@ static int mpls_dev_notify(struct notifier_block *this, unsigned long event,
dev->type == ARPHRD_IPGRE ||
dev->type == ARPHRD_IP6GRE ||
dev->type == ARPHRD_SIT ||
- dev->type == ARPHRD_TUNNEL) {
+ dev->type == ARPHRD_TUNNEL ||
+ dev->type == ARPHRD_TUNNEL6) {
mdev = mpls_add_dev(dev);
if (IS_ERR(mdev))
return notifier_from_errno(PTR_ERR(mdev));