From: David S. Miller <davem@davemloft.net>
Date: Fri, 29 May 2015 03:23:01 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: MMI-PSA29.97-13-9~9894^2~192
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a74eab639ec502eb744528ef7c271576d670aa7a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2015-05-28

1) Remove xfrm_queue_purge as this is the same as skb_queue_purge.

2) Optimize policy and state walk.

3) Use a sane return code if afinfo registration fails.

4) Only check fori a acquire state if the state is not valid.

5) Remove a unnecessary NULL check before xfrm_pol_hold
   as it checks the input for NULL.

6) Return directly if the xfrm hold queue is empty, avoid
   to take a lock as it is nothing to do in this case.

7) Optimize the inexact policy search and allow for matching
   of policies with priority ~0U.

All from Li RongQing.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a74eab639ec502eb744528ef7c271576d670aa7a