diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-09 14:39:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-09 14:39:37 -0400 |
| commit | 634d8ee4de9e41726d4f6f68f57cdd8647b3d204 (patch) | |
| tree | a6e2495cee699661625fca8a97a415b4827d15bf /lib/idr.c | |
| parent | 11f17ef3154fc8a7876a9ada1d1b80d41106960a (diff) | |
| parent | 092a29a40bab8bb4530bb3e58a0597001cdecdef (diff) | |
| download | linux-634d8ee4de9e41726d4f6f68f57cdd8647b3d204.tar.gz linux-634d8ee4de9e41726d4f6f68f57cdd8647b3d204.tar.bz2 linux-634d8ee4de9e41726d4f6f68f57cdd8647b3d204.zip | |
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>
Diffstat (limited to 'lib/idr.c')
0 files changed, 0 insertions, 0 deletions