tree e9f60ac111931fd8d2cd19f678e6f57dbf514ef2
parent c17cb8b55b104c549aa20a72fa44141ad2c65ec2
parent 84502b5ef9849a9694673b15c31bd3ac693010ae
author David S. Miller <davem@davemloft.net> 1383369759 -0400
committer David S. Miller <davem@davemloft.net> 1383369759 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
1) Fix a possible race on ipcomp scratch buffers because
   of too early enabled siftirqs. From Michal Kubecek.

2) The current xfrm garbage collector threshold is too small
   for some workloads, resulting in bad performance on these
   workloads. Increase the threshold from 1024 to 32768.

3) Some codepaths might not have a dst_entry attached to the
   skb when calling xfrm_decode_session(). So add a check
   to prevent a null pointer dereference in this case.
====================

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