diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-02-25 18:25:53 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-02-25 18:25:53 +0100 |
| commit | ce95af7a5f5159033e569a7ccedce0e20bb5d913 (patch) | |
| tree | cc4459914d2953487af40b927eb9d3f989c18740 | |
| parent | b25509e5128e6f2a856cd4a07bb78f3d6b7fc789 (diff) | |
| parent | e3f506f9b53bd8e44976df1c935c7ec417793ace (diff) | |
Merge branch 'master' of gitlab.labs.nic.cz:labs/bird
| -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 77ce839a..67ae094d 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -599,10 +599,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) |