From: Maria Matejka <mq@ucw.cz>
Date: Mon, 31 Mar 2025 14:02:30 +0000 (+0200)
Subject: Merge commit 'f4a94644d' into thread-next
X-Git-Tag: v3.1.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=230b460b5d04d05d1bb830a4180920446c016a9a;p=thirdparty%2Fbird.git

Merge commit 'f4a94644d' into thread-next
---

230b460b5d04d05d1bb830a4180920446c016a9a
diff --cc proto/bgp/bgp.h
index 5d9abc0ca,5ec7a9f94..083d75426
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@@ -524,7 -463,9 +529,8 @@@ struct bgp_write_state 
    int mp_reach;
    int as4_session;
    int add_path;
+   int llnh_format;
    int mpls;
 -  int sham;
    int ignore_non_bgp_attrs;
  
    eattr *mp_next_hop;
diff --cc proto/bgp/config.Y
index 4892eeaac,11003d4e9..17906d75a
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@@ -29,14 -30,12 +29,14 @@@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, H
  	GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
  	STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,
  	LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
 -	DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
 +	DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
  	FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
 -	RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, MIN, MAX,
 -	FORMAT, NATIVE, SINGLE, DOUBLE)
 +	RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, TX, SIZE, WARNING,
- 	MIN, MAX)
++	MIN, MAX, FORMAT, NATIVE, SINGLE, DOUBLE)
 +
 +CF_ENUM(T_ENUM_BGP_ORIGIN, ORIGIN_, IGP, EGP, INCOMPLETE)
  
- %type <i> bgp_nh
+ %type <i> bgp_nh bgp_llnh
  %type <i32> bgp_afi
  
  CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,