From: kn Date: Thu, 18 Mar 2021 14:47:17 +0000 (+0000) Subject: Fix SIOCDELLABEL/"ifconfig mpe0 -mplslabel" to unset label completely X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b37ade80937bf2c6beed61981a98c8f2db94ad77;p=openbsd Fix SIOCDELLABEL/"ifconfig mpe0 -mplslabel" to unset label completely While the corresponding route gets removed properly, the driver's softc kept the old label, i.e. "ifconfig mpe0" would show "mpls: label 42" instead of "mpls: label (unset)" even though it was unset. OK claudio --- diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index f6b39406671..5d14bfc440f 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.98 2021/02/20 05:03:37 dlg Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.99 2021/03/18 14:47:17 kn Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard @@ -401,7 +401,7 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) smplstosa(&sc->sc_smpls), sc->sc_rdomain); } - shim.shim_label = MPLS_LABEL2SHIM(0); + sc->sc_smpls.smpls_label = MPLS_LABEL2SHIM(0); break; case SIOCSLIFPHYRTABLE: