diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-04 16:39:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-04 16:39:53 +0200 |
| commit | 663255a3a67a39d0fe164cf9b3bac697305e5550 (patch) | |
| tree | ae53b68bf654c74c9c797523bb72351173b7ee8b /packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch | |
| parent | 4490b2aeecfde600a1b4050b21dc21113e1ad69a (diff) | |
| parent | 38cae97177191ad6876a4ce7afb4f53b21bf746c (diff) | |
| download | vyos-build-663255a3a67a39d0fe164cf9b3bac697305e5550.tar.gz vyos-build-663255a3a67a39d0fe164cf9b3bac697305e5550.zip | |
Merge pull request #591 from c-po/frr
frr: T6283: T6250: add pending upstream patches
Diffstat (limited to 'packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch')
| -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); |