diff options
| -rw-r--r-- | doc/bird.sgml | 7 | ||||
| -rw-r--r-- | nest/iface.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/doc/bird.sgml b/doc/bird.sgml index d1a3b70f..cca7d470 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -2614,13 +2614,6 @@ using the following configuration parameters: disabled. Default: on, with automatic fallback to off when received capability-related error. - <tag><label id="bgp-advertise-ipv4">advertise ipv4 <m/switch/</tag> - Advertise IPv4 multiprotocol capability. This is not a correct behavior - according to the strict interpretation of <rfc id="4760">, but it is - widespread and required by some BGP implementations (Cisco and Quagga). - This option is relevant to IPv4 mode with enabled capability - advertisement only. Default: on. - <tag><label id="bgp-advertise-hostname">advertise hostname <m/switch/</tag> Advertise hostname capability along with the hostname. Default: off. diff --git a/nest/iface.c b/nest/iface.c index 4c017f50..78f4eb0f 100644 --- a/nest/iface.c +++ b/nest/iface.c @@ -640,7 +640,7 @@ ifa_update(struct ifa *a) if (ipa_equal(b->brd, a->brd) && ipa_equal(b->opposite, a->opposite) && b->scope == a->scope && - !((b->flags ^ a->flags) & IA_PEER)) + !((b->flags ^ a->flags) & (IA_SECONDARY | IA_PEER | IA_HOST))) { b->flags |= IA_UPDATED; return b; |