diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-08 12:09:31 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-08 12:28:33 +0200 |
| commit | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (patch) | |
| tree | 153afd214a815124b37fcd88c66134d716a390cf /proto/ospf/iface.c | |
| parent | 4bdf1881dc6230b742d7efcaad8eeac4ed25f445 (diff) | |
| parent | 06edbb67ed807811654e7fd8f0f9b83766430216 (diff) | |
Merge branch 'master' into int-new-channels
Diffstat (limited to 'proto/ospf/iface.c')
| -rw-r--r-- | proto/ospf/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 6001ac26..4548f6da 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -595,10 +595,10 @@ ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *i if (ospf_is_v2(p) && (ifa->type == OSPF_IT_NBMA) && (addr->flags & IA_PEER)) ifa->type = OSPF_IT_PTMP; - if ((ifa->type == OSPF_IT_BCAST) && !(iface->flags & if_multi_flag)) + if ((ifa->type == OSPF_IT_BCAST) && !(iface->flags & if_multi_flag) && !ifa->stub) ifa->type = OSPF_IT_NBMA; - if ((ifa->type == OSPF_IT_PTP) && !(iface->flags & if_multi_flag)) + if ((ifa->type == OSPF_IT_PTP) && !(iface->flags & if_multi_flag) && !ifa->stub) ifa->type = OSPF_IT_PTMP; if (ifa->type != old_type) |