diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-19 09:49:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-19 09:49:35 +0200 |
| commit | cf5a239844f9d2df91d3ce0bf7dbe371bd407e35 (patch) | |
| tree | 638206873ccd8ab7296453cb4840c532fdeca891 /packages/frr/patches/0002-bgpd-allow-using-optional-table-id-for-negative.patch | |
| parent | d645e45713877585670eecccb0ed5802d01443ba (diff) | |
| parent | e6b7668c6599e7cdf9af61ff4354cf046387314e (diff) | |
| download | vyos-build-cf5a239844f9d2df91d3ce0bf7dbe371bd407e35.tar.gz vyos-build-cf5a239844f9d2df91d3ce0bf7dbe371bd407e35.zip | |
Merge pull request #632 from vyos/mergify/bp/sagitta/pr-631
frr: T6250: T6283: revert local patches merged upstream (backport #631)
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, 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); |