summaryrefslogtreecommitdiffstats
path: root/sys/net/if_mpe.c
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2019-01-27 05:31:10 +0000
committerdlg <dlg@openbsd.org>2019-01-27 05:31:10 +0000
commitd2dc04a5b9cf6b92d2fc5c15e77cebae412cf865 (patch)
tree8500e642e5f0fce7fc3e201dbbd3984609551c24 /sys/net/if_mpe.c
parentuse mpls_ip_adjttl and mpls_ip6_adjttl in mpe instead of rolling it again. (diff)
downloadwireguard-openbsd-d2dc04a5b9cf6b92d2fc5c15e77cebae412cf865.tar.xz
wireguard-openbsd-d2dc04a5b9cf6b92d2fc5c15e77cebae412cf865.zip
don't play with IFF_UP in strange places.
Diffstat (limited to 'sys/net/if_mpe.c')
-rw-r--r--sys/net/if_mpe.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 826cbdb1530..7ecaafcb017 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.70 2019/01/27 05:13:04 dlg Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.71 2019/01/27 05:31:10 dlg Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -299,8 +299,6 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
ifr = (struct ifreq *)data;
switch (cmd) {
case SIOCSIFADDR:
- if (!ISSET(ifp->if_flags, IFF_UP))
- if_up(ifp);
break;
case SIOCSIFFLAGS:
if (ifp->if_flags & IFF_UP)
@@ -343,12 +341,6 @@ mpe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
}
if (error)
break;
- /*
- * force interface up for now,
- * linkstate of MPLS route is not tracked
- */
- if (!ISSET(ifp->if_flags, IFF_UP))
- if_up(ifp);
ifm = ifp->if_softc;
if (ifm->sc_smpls.smpls_label) {
/* remove old MPLS route */