From 9c09a05269f53f5133d2b0d58d89f7638150d318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=98=E6=80=80?= Date: Tue, 10 Feb 2026 13:34:13 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"net/ipv6:=20Fix=20KABI=20for=20Remove?= =?UTF-8?q?=20expired=20routes=20with=20a=20separated=20list=20of=E2=80=A6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3427f09d764b327609941ef99e6f3e9bb24763e7. --- include/net/ip6_fib.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 188a57443865f..b635e27d0cb1f 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -186,6 +186,8 @@ struct fib6_info { refcount_t fib6_ref; unsigned long expires; + struct hlist_node gc_link; + struct dst_metrics *fib6_metrics; #define fib6_pmtu fib6_metrics->metrics[RTAX_MTU-1] @@ -211,7 +213,8 @@ struct fib6_info { struct rcu_head rcu; struct nexthop *nh; - DEEPIN_KABI_USE(1, 2, struct hlist_node gc_link) + DEEPIN_KABI_RESERVE(1) + DEEPIN_KABI_RESERVE(2) struct fib6_nh fib6_nh[]; }; @@ -411,7 +414,7 @@ struct fib6_table { struct inet_peer_base tb6_peers; unsigned int flags; unsigned int fib_seq; - DEEPIN_KABI_EXTEND(struct hlist_head tb6_gc_hlist) /* GC candidates */ + struct hlist_head tb6_gc_hlist; /* GC candidates */ #define RT6_TABLE_HAS_DFLT_ROUTER BIT(0) };