Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1678c113 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 834d9649 c2f672fc

include/uapi/linux/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ enum xfrm_attr_type_t { 
	XFRMA_ALG_AUTH_TRUNC,	/* struct xfrm_algo_auth */

	XFRMA_MARK,		/* struct xfrm_mark */

	XFRMA_TFCPAD,		/* __u32 */

	XFRMA_REPLAY_ESN_VAL,	/* struct xfrm_replay_esn */

	XFRMA_REPLAY_ESN_VAL,	/* struct xfrm_replay_state_esn */

	XFRMA_SA_EXTRA_FLAGS,	/* __u32 */

	XFRMA_PROTO,		/* __u8 */

	XFRMA_ADDRESS_FILTER,	/* struct xfrm_address_filter */

net/xfrm/xfrm_state.c

+2 −2
Original line number Diff line number Diff line
@@ -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);