Skip to content

Commit 63f9e8a

Browse files
authored
Merge pull request #1451 from kernelkit/frr
Bump FRR to 10.5.3 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
2 parents 2fea1e4 + be85775 commit 63f9e8a

5 files changed

Lines changed: 14 additions & 6 deletions

buildroot

doc/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ All notable changes to the project are documented in this file.
1010

1111
- Upgrade Linux kernel to 6.18.18 (LTS)
1212
- Upgrade Buildroot to 2025.02.12 (LTS)
13+
- Upgrade FRR to 10.5.3
1314
- Add support for [Banana Pi R64 Mini][BPI-R64], 5 port router with WiFi 5
1415
- Add support for [Raspberry Pi 400][RPI-400], an RPi 4B built into a keyboard
1516
- **Revamped <http://network.local> device browser**. Device cards now

patches/frr/10.5.1/0001-Libyang4-compat.patch renamed to patches/frr/10.5.3/0001-Libyang4-compat.patch

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
From 597cf064f6076e3859f72b0da4dc0ab98ca2e1d2 Mon Sep 17 00:00:00 2001
1+
From 39ebf709e91a89f59e14ac1d1179df170448d09a Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
33
Date: Tue, 27 Jan 2026 22:54:59 +0100
44
Subject: [PATCH 1/3] Libyang4 compat
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
58
Organization: Wires
69

710
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 renamed to patches/frr/10.5.3/0002-Failed-without-c-23-this-adds-compatibility-layer.patch

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
From 859bc23f318cfa019b104e83591f185f5bcc3bd4 Mon Sep 17 00:00:00 2001
1+
From 6f7ff746c4016ea6e6d81c7abad088f5a86f8fbf Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
33
Date: Fri, 30 Jan 2026 13:00:12 +0100
44
Subject: [PATCH 2/3] Failed without c++ 23, this adds compatibility layer
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
58
Organization: Wires
69

710
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 renamed to patches/frr/10.5.3/0003-zebra-don-t-resolve-nexthop-via-inactive-connected-r.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From daf4378dbf9d48372e2d10e825d67ba652abda87 Mon Sep 17 00:00:00 2001
1+
From 868d13c0982a0633e4144d03776358837d92cd8b Mon Sep 17 00:00:00 2001
22
From: Joachim Wiberg <troglobit@gmail.com>
33
Date: Sun, 22 Feb 2026 10:22:06 +0100
44
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
4141
using a stale interface index.
4242

4343
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
44+
Signed-off-by: Mattias Walström <lazzer@gmail.com>
4445
---
4546
zebra/zebra_nhg.c | 9 +++++++++
4647
1 file changed, 9 insertions(+)
4748

4849
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
49-
index f5f78050f1..39b61c02f8 100644
50+
index ccb354cf86..7e5cc0212a 100644
5051
--- a/zebra/zebra_nhg.c
5152
+++ b/zebra/zebra_nhg.c
52-
@@ -2466,6 +2466,15 @@ static int nexthop_active(struct nexthop *nexthop, struct nhg_hash_entry *nhe,
53+
@@ -2467,6 +2467,15 @@ static int nexthop_active(struct nexthop *nexthop, struct nhg_hash_entry *nhe,
5354
nexthop->ifindex);
5455

5556
newhop = match->nhe->nhg.nexthop;

0 commit comments

Comments
 (0)