diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-10-17 14:44:34 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-10-17 14:44:34 +0200 |
| commit | 8eb8e546dc8cc647fcfa4a3a17dfa8ab36b00958 (patch) | |
| tree | 837c79b9e4adbe8d9d5fb2ffaa56f89b5e491db2 /proto/ospf/iface.c | |
| parent | 8465dccb06afffed171dc1e224e4eb5f67cc3326 (diff) | |
| parent | acb04cfdc550697a7171a86ca559fd8c52841acb (diff) | |
Merge branch 'master' into rip-new
Diffstat (limited to 'proto/ospf/iface.c')
| -rw-r--r-- | proto/ospf/iface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 9b0f7797..77ce839a 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -493,8 +493,11 @@ ospf_iface_add(struct object_lock *lock) ifa->flood_queue = mb_allocz(ifa->pool, ifa->flood_queue_size * sizeof(void *)); } - /* Do iface UP, unless there is no link and we use link detection */ - ospf_iface_sm(ifa, (ifa->check_link && !(ifa->iface->flags & IF_LINK_UP)) ? ISM_LOOP : ISM_UP); + /* Do iface UP, unless there is no link (then wait in LOOP state) */ + if (!ifa->check_link || (ifa->iface->flags & IF_LINK_UP)) + ospf_iface_sm(ifa, ISM_UP); + else + ospf_iface_chstate(ifa, OSPF_IS_LOOP); } static inline void |