tree fb8ca76be227f2e7a4045a8939951be8c3b04250
parent a4a1139b242f03dfb8a5d7a86fa674bda1cf60b2
parent 4c4d41f200db375b2d2cc6d0a1de0606c8266398
author David S. Miller <davem@davemloft.net> 1372278193 -0700
committer David S. Miller <davem@davemloft.net> 1372278193 -0700

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

Steffen Klassert says:

====================
Just one patch this time.

1) Drop packets when the matching SA is in larval state and add a
   statistic counter for that. From Fan Du.

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

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