Revert "frr: T6250: add pending upstream patch"

This reverts commit 38cae97177191ad6876a4ce7afb4f53b21bf746c.

Upstream patch merged
This commit is contained in:
Christian Breunig 2024-05-19 08:24:40 +02:00
parent eff3d4aab6
commit 2d6b51e13a

View File

@ -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);