diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-19 08:24:40 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-19 06:27:51 +0000 |
| commit | 696fc103549bca66aadac0f1801f2255c0311d1f (patch) | |
| tree | 781f26fe058d32b44ce19b94e1bf95d229c74b83 /packages | |
| parent | b9c4a6a2186ca057dc900b3ae225f335d2d0a578 (diff) | |
| download | vyos-build-696fc103549bca66aadac0f1801f2255c0311d1f.tar.gz vyos-build-696fc103549bca66aadac0f1801f2255c0311d1f.zip | |
Revert "frr: T6250: add pending upstream patch"
This reverts commit 38cae97177191ad6876a4ce7afb4f53b21bf746c.
Upstream patch merged
(cherry picked from commit 2d6b51e13a7b329d710f811b50c7a18544c96312)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch | 29 |
1 files changed, 0 insertions, 29 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 deleted file mode 100644 index c414490e..00000000 --- a/packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch +++ /dev/null @@ -1,29 +0,0 @@ -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); |