From: Maria Matejka Date: Fri, 14 Apr 2023 11:42:42 +0000 (+0200) Subject: Merge commit 'ee919658' into thread-next-iface X-Git-Tag: v3.0-alpha1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea30d596d3732b3d2c4b1f55ebdc7cc018dd20bb;p=thirdparty%2Fbird.git Merge commit 'ee919658' into thread-next-iface --- ea30d596d3732b3d2c4b1f55ebdc7cc018dd20bb diff --cc proto/babel/config.Y index a4350eed8,1b4dc6f5f..6d1ad7d0f --- a/proto/babel/config.Y +++ b/proto/babel/config.Y @@@ -24,8 -24,9 +24,9 @@@ CF_DECL CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK, - NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, + NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS, - ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE) + ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE, + EXTENDED) CF_GRAMMAR