diff options
| author |   claudio <claudio@openbsd.org> | 2011-07-04 04:34:14 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2011-07-04 04:34:14 +0000 |
| commit | 9a2e03246675e892868339245b0f9cf1bb1112d2 (patch) | |
| tree | 4b691a45591f78df988cdbd0cd9271451eb7445b /usr.sbin/ospf6d/interface.c | |
| parent | bread does nothing with its ucred argument. remove it. ok matthew (diff) | |
| download | wireguard-openbsd-9a2e03246675e892868339245b0f9cf1bb1112d2.tar.xz wireguard-openbsd-9a2e03246675e892868339245b0f9cf1bb1112d2.zip | |
LINK_STATE_IS_UP() cleanup userland part. There is no need to special
case carp(4) interfaces anymore. LINK_STATE_IS_UP() almost always does
the right job.
OK deraadt@ henning@
This needs a -current kernel or link state may be not reported correctly.
Diffstat (limited to 'usr.sbin/ospf6d/interface.c')
| -rw-r--r-- | usr.sbin/ospf6d/interface.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c index 6779b962c65..ad86e2a0fe9 100644 --- a/usr.sbin/ospf6d/interface.c +++ b/usr.sbin/ospf6d/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.17 2011/07/04 04:08:34 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.18 2011/07/04 04:34:14 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -370,9 +370,7 @@ if_act_start(struct iface *iface) struct timeval now; if (!((iface->flags & IFF_UP) && - (LINK_STATE_IS_UP(iface->linkstate) || - (iface->linkstate == LINK_STATE_UNKNOWN && - iface->media_type != IFT_CARP)))) { + LINK_STATE_IS_UP(iface->linkstate))) { log_debug("if_act_start: interface %s link down", iface->name); return (0); |