]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:39:37 +0000 (14:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:39:37 +0000 (14:39 -0400)
commit658e6633e91ab9f88c8fe0c33ac1634dfb7a10e6
treea6e2495cee699661625fca8a97a415b4827d15bf
parent8352b24f90c561f6eeef98efb0ac44d0cafa5a12
parente49743d6428ef1ff099fefcaad3fe34c1cf5e332
Merge branch 'master' of git://git.kernel.org/pub/scm/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>