diff options
| author | David S. Miller | 2014-02-27 22:19:41 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-02-27 22:19:41 +0100 |
| commit | 23187212e7c3664f6a0d8ccd83b6d32c05aeafcb (patch) | |
| tree | 68e3c4c32c1295bb65da6f936be890290670c992 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | net: ipv6: ping: Use socket mark in routing lookup (diff) | |
| parent | xfrm: Fix unlink race when policies are deleted. (diff) | |
| download | kernel-qcow2-linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.tar.gz kernel-qcow2-linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.tar.xz kernel-qcow2-linux-23187212e7c3664f6a0d8ccd83b6d32c05aeafcb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Build fix for ip_vti when NET_IP_TUNNEL is not set.
We need this set to have ip_tunnel_get_stats64()
available.
2) Fix a NULL pointer dereference on sub policy usage.
We try to access a xfrm_state from the wrong array.
3) Take xfrm_state_lock in xfrm_migrate_state_find(),
we need it to traverse through the state lists.
4) Clone states properly on migration, otherwise we crash
when we migrate a state with aead algorithm attached.
5) Fix unlink race when between thread context and timer
when policies are deleted.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
0 files changed, 0 insertions, 0 deletions