diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2023-10-31 18:06:13 +0100 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2023-10-31 18:06:13 +0100 |
| commit | 7360b0d414c228852a2273d75dffec51a00a9640 (patch) | |
| tree | 64c79e46f1ad59f8f64eeabeff8add86321d4c28 | |
| parent | 1d0edd80512a096926b4fcee5dc39a4f2a918c93 (diff) | |
| download | linux-stk-xfrm-pcpu-v4.tar.gz | |
xfrm: Don't initialize xfrm_state_lock twice.xfrm-pcpu-v4
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 | ||||
| -rw-r--r-- | net/xfrm/xfrm_state.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index dd346d970eadd..49e3e9eec21a0 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -4132,6 +4132,8 @@ static int __net_init xfrm_net_init(struct net *net) /* Initialize the per-net locks here */ spin_lock_init(&net->xfrm.xfrm_state_lock); + seqcount_spinlock_init(&net->xfrm.xfrm_state_hash_generation, + &net->xfrm.xfrm_state_lock); spin_lock_init(&net->xfrm.xfrm_policy_lock); seqcount_spinlock_init(&net->xfrm.xfrm_policy_hash_generation, &net->xfrm.xfrm_policy_lock); mutex_init(&net->xfrm.xfrm_cfg_mutex); diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index d26e9c9498ccc..1f93b5a9cac59 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -3019,9 +3019,6 @@ int __net_init xfrm_state_init(struct net *net) net->xfrm.state_num = 0; INIT_WORK(&net->xfrm.state_hash_work, xfrm_hash_resize); - spin_lock_init(&net->xfrm.xfrm_state_lock); - seqcount_spinlock_init(&net->xfrm.xfrm_state_hash_generation, - &net->xfrm.xfrm_state_lock); return 0; out_state_cache_input: |