Skip to content

Commit 1aa885a

Browse files
committed
net/ipv6: Fix KABI for Remove expired routes with a separated list of routes
deepin inclusion category: kabi Fix kabi change in some whitelist symbols like nf_ct_netns_get..etc. Log: struct hlist_node { struct hlist_node * next; /* 0 8 */ struct hlist_node * * pprev; /* 8 8 */ /* size: 16, cachelines: 1, members: 2 */ /* last cacheline: 16 bytes */ }; Fixes: 87ef084 ("ipv6: add exception routes to GC list in rt6_insert_exception") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 0d3594d commit 1aa885a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

include/net/ip6_fib.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@ struct fib6_info {
186186
refcount_t fib6_ref;
187187
unsigned long expires;
188188

189-
struct hlist_node gc_link;
190-
191189
struct dst_metrics *fib6_metrics;
192190
#define fib6_pmtu fib6_metrics->metrics[RTAX_MTU-1]
193191

@@ -213,8 +211,7 @@ struct fib6_info {
213211
struct rcu_head rcu;
214212
struct nexthop *nh;
215213

216-
DEEPIN_KABI_RESERVE(1)
217-
DEEPIN_KABI_RESERVE(2)
214+
DEEPIN_KABI_USE(1, 2, struct hlist_node gc_link)
218215

219216
struct fib6_nh fib6_nh[];
220217
};
@@ -414,7 +411,7 @@ struct fib6_table {
414411
struct inet_peer_base tb6_peers;
415412
unsigned int flags;
416413
unsigned int fib_seq;
417-
struct hlist_head tb6_gc_hlist; /* GC candidates */
414+
DEEPIN_KABI_EXTEND(struct hlist_head tb6_gc_hlist) /* GC candidates */
418415
#define RT6_TABLE_HAS_DFLT_ROUTER BIT(0)
419416
};
420417

0 commit comments

Comments
 (0)