summaryrefslogtreecommitdiff
path: root/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-08 22:56:23 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-08 22:01:10 +0000
commit795d890d6570036753e8c03616d38a7f3f692dfe (patch)
treeeffbe6c8e6aa07df2a07b83336a2e85ebca44275 /packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch
parent8e29331e2d6e95b113a8b6bc8feadec55d3f86ab (diff)
downloadvyos-build-795d890d6570036753e8c03616d38a7f3f692dfe.tar.gz
vyos-build-795d890d6570036753e8c03616d38a7f3f692dfe.zip
frr: T6023: add pending upstream patches
Latest stable/9.0 FRR branch has an updated version of frr-reload.py which is more strict on the commands to remove from the running config. This resulted in some issues in the codebase of FRR which are addressed in the attached patches and are pending for upstream integration. (cherry picked from commit 798b95eb9776486aed874346869a8238383c18f6)
Diffstat (limited to 'packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch')
-rw-r--r--packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch b/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch
new file mode 100644
index 00000000..c814330c
--- /dev/null
+++ b/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch
@@ -0,0 +1,34 @@
+From 07dbae1f59592d4da0b6a248ba24506d23f1dcd9 Mon Sep 17 00:00:00 2001
+From: Christian Breunig <christian@breunig.cc>
+Date: Thu, 8 Feb 2024 21:53:35 +0100
+Subject: [PATCH] ospfd: can not delete "segment-routing node-msd" when SR if
+ off
+
+This fixes the initial implementation of commit 7743f2f8c00 ("OSPFd: Update
+Segment Routing PR following review") where it wsa not possible to remove
+the "segment-routing node-msd" CLI nodes via vtysh once segment-routing got
+disabled.
+
+Closes #14910
+
+Signed-off-by: Christian Breunig <christian@breunig.cc>
+(cherry picked from commit ba45aa62e7bcc4ea7b02773614f03efb6f7c595b)
+---
+ ospfd/ospf_sr.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
+index 467cb0504..e26fe6f53 100644
+--- a/ospfd/ospf_sr.c
++++ b/ospfd/ospf_sr.c
+@@ -580,6 +580,7 @@ static void ospf_sr_stop(void)
+ hash_clean(OspfSR.neighbors, (void *)sr_node_del);
+ OspfSR.self = NULL;
+ OspfSR.status = SR_OFF;
++ OspfSR.msd = 0;
+ }
+
+ /*
+--
+2.39.2
+