diff options
-rw-r--r-- | doc/bird.sgml | 10 | ||||
-rw-r--r-- | proto/ospf/config.Y | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/doc/bird.sgml b/doc/bird.sgml index b3ac38b0..b4e5d176 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -3511,16 +3511,6 @@ protocol ospf [v2|v3] <name> { <m/dead/ seconds, it will consider the neighbor down. If both directives <cf/dead count/ and <cf/dead/ are used, <cf/dead/ has precedence. - <tag><label id="ospf-secondary">secondary <M>switch</M></tag> - On BSD systems, older versions of BIRD supported OSPFv2 only for the - primary IP address of an interface, other IP ranges on the interface - were handled as stub networks. Since v1.4.1, regular operation on - secondary IP addresses is supported, but disabled by default for - compatibility. This option allows to enable it. The option is a - transitional measure, will be removed in the next major release as the - behavior will be changed. On Linux systems, the option is irrelevant, as - operation on non-primary addresses is already the regular behavior. - <tag><label id="ospf-rx-buffer">rx buffer <M>num</M></tag> This option allows to specify the size of buffers used for packet processing. The buffer size should be bigger than maximal size of any diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index b89584e1..2ec9babe 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -199,7 +199,7 @@ CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY, BFD) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL) CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY) CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY, LENGTH) -CF_KEYWORDS(SECONDARY, MERGE, LSA, SUPPRESSION, MULTICAST, RFC5838) +CF_KEYWORDS(MERGE, LSA, SUPPRESSION, MULTICAST, RFC5838) %type <ld> lsadb_args %type <i> ospf_variant ospf_af_mc nbma_eligible |