diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-07-04 04:34:15 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-07-04 04:34:15 +0000 |
| commit | e03be1c13da2627f88815c4221fd7aea1ef8f515 (patch) | |
| tree | a68cb661597a54bfac8799839218986aea79977e /usr.sbin/bgpd/session.c | |
| parent | 6558208a6b4fc7625013eefd861685b315297077 (diff) | |
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/bgpd/session.c')
| -rw-r--r-- | usr.sbin/bgpd/session.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 0d608167ae3..cfc60229532 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.317 2011/05/05 06:21:44 henning Exp $ */ +/* $OpenBSD: session.c,v 1.318 2011/07/04 04:34:14 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -2461,9 +2461,7 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt) fatalx("IFINFO imsg with wrong len"); kif = imsg.data; depend_ok = (kif->flags & IFF_UP) && - (LINK_STATE_IS_UP(kif->link_state) || - (kif->link_state == LINK_STATE_UNKNOWN && - kif->media_type != IFT_CARP)); + LINK_STATE_IS_UP(kif->link_state); for (p = peers; p != NULL; p = p->next) if (!strcmp(p->conf.if_depend, kif->ifname)) { |