From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Wed, 7 Mar 2018 16:41:49 +0000 (+0100)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.2~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f47327f81a278d6adb3d0a6c235ea715798d01;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

d0f47327f81a278d6adb3d0a6c235ea715798d01
diff --cc proto/babel/config.Y
index 25ce5ba01,dcc0847ee..7adfb4bbc
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@@ -22,9 -20,9 +22,10 @@@ CF_DEFINE
  
  CF_DECLS
  
- CF_KEYWORDS(BABEL, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, WIRED,
- 	WIRELESS, RX, TX, BUFFER, LENGTH, CHECK, LINK, BABEL_METRIC, NEXT, HOP,
- 	IPV4, IPV6)
+ CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
+ 	TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 -	BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, ENTRIES)
++	NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
++	ENTRIES)
  
  CF_GRAMMAR