diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-30 06:25:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-30 06:25:29 +0200 |
| commit | f0b5989745c3e0e92424d36869a97e4e8df7ab13 (patch) | |
| tree | 0e9759b9d6060bb94cad676b1b16e423d5ad2523 /net/xfrm/xfrm_policy.c | |
| parent | Merge branch 'DSA-mtu' (diff) | |
| parent | Linux 5.6 (diff) | |
| download | linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.tar.xz linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment conflict in mac80211.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index d560d723b601..297b2fdb3c29 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -434,7 +434,9 @@ EXPORT_SYMBOL(xfrm_policy_destroy); static void xfrm_policy_kill(struct xfrm_policy *policy) { + write_lock_bh(&policy->lock); policy->walk.dead = 1; + write_unlock_bh(&policy->lock); atomic_inc(&policy->genid); |