From 493d832ea3cc4182790b215901a5b52609548b25 Mon Sep 17 00:00:00 2001 From: David Gwynne Date: Wed, 13 Feb 2019 23:55:57 +0000 Subject: don't confuse the interface rdomain with the one the local label is in. SIOCSIFRDOMAIN is about the routes on top of an mpe interface. the rdomain mpls operates in is independent of that, and currently restricted to rdomain 0. --- sys/net/if_mpe.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'sys') diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index c6a260ad9ed..d2a9d5448ed 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.81 2019/02/13 23:47:42 dlg Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.82 2019/02/13 23:55:56 dlg Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard @@ -327,17 +327,6 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } break; - case SIOCSIFRDOMAIN: - /* must readd the MPLS "route" for our label */ - /* XXX does not make sense, the MPLS route is on rtable 0 */ - if (ifr->ifr_rdomainid != ifp->if_rdomain) { - if (sc->sc_smpls.smpls_label) { - rt_ifa_add(&sc->sc_ifa, RTF_MPLS, - smplstosa(&sc->sc_smpls), 0); - } - } - /* return with ENOTTY so that the parent handler finishes */ - return (ENOTTY); default: return (ENOTTY); } -- cgit v1.2.3