diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 188a57443865..b635e27d0cb1 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)
 };