diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-04 16:17:50 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-04 14:40:40 +0000 |
| commit | a7be110850274ecc5545fbdfa94715c5a57ae37c (patch) | |
| tree | de8ac98812d847b41860a1c59d9831c89b9c6156 | |
| parent | 869f49fb5279b8ea8d4bbf14d1adacff365d2d0a (diff) | |
| download | vyos-build-a7be110850274ecc5545fbdfa94715c5a57ae37c.tar.gz vyos-build-a7be110850274ecc5545fbdfa94715c5a57ae37c.zip | |
frr: T6250: add pending upstream patch
(cherry picked from commit 38cae97177191ad6876a4ce7afb4f53b21bf746c)
| -rw-r--r-- | packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch b/packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch new file mode 100644 index 00000000..c414490e --- /dev/null +++ b/packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch @@ -0,0 +1,29 @@ +From e411988a86f1b719fb16ec4c30499bfc650b4ea7 Mon Sep 17 00:00:00 2001 +From: Donatas Abraitis <donatas@opensourcerouting.org> +Date: Fri, 3 May 2024 08:58:21 +0300 +Subject: [PATCH 2/2] bgpd: Allow using optional table id for negative `no set + table X` command + +Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org> +--- + bgpd/bgp_routemap.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c +index 7eb97dae4d24..df5c2557bd26 100644 +--- a/bgpd/bgp_routemap.c ++++ b/bgpd/bgp_routemap.c +@@ -5897,10 +5897,11 @@ DEFUN_YANG (set_table_id, + + DEFUN_YANG (no_set_table_id, + no_set_table_id_cmd, +- "no set table", ++ "no set table [(1-4294967295)]", + NO_STR + SET_STR +- "export route to non-main kernel table\n") ++ "export route to non-main kernel table\n" ++ "Kernel routing table id\n") + { + const char *xpath = "./set-action[action='frr-bgp-route-map:table']"; + nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); |