diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-24 08:18:19 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-24 08:18:19 -0400 |
| commit | 1678c1134fd4aa26ae498a31b1b90c6401da9af8 (patch) | |
| tree | bd0f27c87a95193b99da0bd9bf67b5b257741f5b /net/xfrm | |
| parent | 834d9649808b1e2bdf6f6a2dec07b7812f78ea1c (diff) | |
| parent | c2f672fc94642bae96821a393f342edcfa9794a6 (diff) | |
| download | linux-1678c1134fd4aa26ae498a31b1b90c6401da9af8.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2016-09-23
Only two patches this time:
1) Fix a comment reference to struct xfrm_replay_state_esn.
From Richard Guy Briggs.
2) Convert xfrm_state_lookup to rcu, we don't need the
xfrm_state_lock anymore in the input path.
From Florian Westphal.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 5685da05e6ce..419bf5d463bd 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1432,9 +1432,9 @@ xfrm_state_lookup(struct net *net, u32 mark, const xfrm_address_t *daddr, __be32 { struct xfrm_state *x; - spin_lock_bh(&net->xfrm.xfrm_state_lock); + rcu_read_lock(); x = __xfrm_state_lookup(net, mark, daddr, spi, proto, family); - spin_unlock_bh(&net->xfrm.xfrm_state_lock); + rcu_read_unlock(); return x; } EXPORT_SYMBOL(xfrm_state_lookup); |