peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1451 from kernelkit/frr

Browse Source 
Bump FRR to 10.5.3

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2026-03-18 17:58:04 +01:00
committed by GitHub
parent 2fea1e4a2b be85775e50
commit 63f9e8a939
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildroot
+1 -1
Submodule buildroot updated: 747f0869a8...79bfb2231d
doc/ChangeLog.md
+1
View File
@@ -10,6 +10,7 @@ All notable changes to the project are documented in this file.
- Upgrade Linux kernel to 6.18.18 (LTS)
- Upgrade Buildroot to 2025.02.12 (LTS)
- Upgrade FRR to 10.5.3
- Add support for [Banana Pi R64 Mini][BPI-R64], 5 port router with WiFi 5
- Add support for [Raspberry Pi 400][RPI-400], an RPi 4B built into a keyboard
- **Revamped <http://network.local> device browser**. Device cards now
patches/frr/10.5.1/0001-Libyang4-compat.patch → patches/frr/10.5.3/0001-Libyang4-compat.patch
+4 -1
View File
@@ -1,7 +1,10 @@
From 597cf064f6076e3859f72b0da4dc0ab98ca2e1d2 Mon Sep 17 00:00:00 2001
From 39ebf709e91a89f59e14ac1d1179df170448d09a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Tue, 27 Jan 2026 22:54:59 +0100
Subject: [PATCH 1/3] Libyang4 compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Wires
libyang4 had breaking changes needs to be adapded for it.
patches/frr/10.5.1/0002-Failed-without-c-23-this-adds-compatibility-layer.patch → patches/frr/10.5.3/0002-Failed-without-c-23-this-adds-compatibility-layer.patch
+4 -1
View File
@@ -1,7 +1,10 @@
From 859bc23f318cfa019b104e83591f185f5bcc3bd4 Mon Sep 17 00:00:00 2001
From 6f7ff746c4016ea6e6d81c7abad088f5a86f8fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Fri, 30 Jan 2026 13:00:12 +0100
Subject: [PATCH 2/3] Failed without c++ 23, this adds compatibility layer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Wires
Signed-off-by: Mattias Walström <lazzer@gmail.com>
patches/frr/10.5.1/0003-zebra-don-t-resolve-nexthop-via-inactive-connected-r.patch → patches/frr/10.5.3/0003-zebra-don-t-resolve-nexthop-via-inactive-connected-r.patch
+4 -3
View File
@@ -1,4 +1,4 @@
From daf4378dbf9d48372e2d10e825d67ba652abda87 Mon Sep 17 00:00:00 2001
From 868d13c0982a0633e4144d03776358837d92cd8b Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sun, 22 Feb 2026 10:22:06 +0100
Subject: [PATCH 3/3] zebra: don't resolve nexthop via inactive connected route
@@ -41,15 +41,16 @@ continue_up_tree so that the lookup can try parent prefixes rather than
using a stale interface index.
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Mattias Walström <lazzer@gmail.com>
---
zebra/zebra_nhg.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index f5f78050f1..39b61c02f8 100644
index ccb354cf86..7e5cc0212a 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -2466,6 +2466,15 @@ static int nexthop_active(struct nexthop *nexthop, struct nhg_hash_entry *nhe,
@@ -2467,6 +2467,15 @@ static int nexthop_active(struct nexthop *nexthop, struct nhg_hash_entry *nhe,
nexthop->ifindex);
newhop = match->nhe->nhg.nexthop;