From: David S. Miller <davem@davemloft.net>
Date: Thu, 9 Apr 2015 18:39:37 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=634d8ee4de9e41726d4f6f68f57cdd8647b3d204;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

Steffen Klassert says:

====================
pull request (net): ipsec 2015-04-09

1) We dereferenced the xfrm outer_mode too early, larval
   SAs don't have it set. Move the dereference of the
   outer mode below the larval SA check to fix it.
   From Alexey Dobriyan.

2) Fix vti6 tunnel uninit on namespace crosssing.
   From Yao Xiwei.

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

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

634d8ee4de9e41726d4f6f68f57cdd8647b3d204