diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2026-07-07 10:51:08 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2026-07-07 10:51:09 +0200 |
| commit | 31816fc5d9acf8cdf226cdd0dc296e8cf15cc033 (patch) | |
| tree | db5f8bd435d9c79b93ec9dfca3315e5a2952a257 /include | |
| parent | 474cff6868129755cf889edf40d7f491729fc588 (diff) | |
| parent | 99c13f8020df1b06f68044ec93649b0b50f37d79 (diff) | |
Merge branch 'net-misc-follow-up-on-rtnl-less-fib_rules-series'
Kuniyuki Iwashima says:
====================
net: Misc follow-up on RTNL-less fib_rules series.
Patch 1 moves net->ipv4.fib_table_hash_lock under
CONFIG_IP_MULTIPLE_TABLES.
Patch 2 adds mutex_destroy() for fib_rules_ops.lock.
====================
Link: https://patch.msgid.link/20260702044437.591864-1-kuniyu@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/ipv4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 59506320558a..cb7f8bf15671 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -118,6 +118,7 @@ struct netns_ipv4 { struct fib_rules_ops *rules_ops; struct fib_table __rcu *fib_main; struct fib_table __rcu *fib_default; + spinlock_t fib_table_hash_lock; unsigned int fib_rules_require_fldissect; bool fib_has_custom_rules; #endif @@ -127,7 +128,6 @@ struct netns_ipv4 { atomic_t fib_num_tclassid_users; #endif struct hlist_head *fib_table_hash; - spinlock_t fib_table_hash_lock; struct sock *fibnl; struct hlist_head *fib_info_hash; unsigned int fib_info_hash_bits; |