Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: af_key: Free dumping state on socket close XFRM,IPv6: initialize ip6_dst_blackhole_ops.kmem_cachep ipv6: NULL pointer dereferrence in tcp_v6_send_ack tcp: Fix NULL dereference in tcp_4_send_ack() sctp: Fix kernel panic while process protocol violation parameter iucv: Fix mismerge again. ipsec: Fix pskb_expand_head corruption in xfrm_state_check_space
No related branches found
No related tags found
Showing
- include/net/sctp/sm.h 3 additions, 0 deletionsinclude/net/sctp/sm.h
- net/ipv4/tcp_ipv4.c 1 addition, 1 deletionnet/ipv4/tcp_ipv4.c
- net/ipv6/route.c 2 additions, 0 deletionsnet/ipv6/route.c
- net/ipv6/tcp_ipv6.c 1 addition, 1 deletionnet/ipv6/tcp_ipv6.c
- net/iucv/iucv.c 2 additions, 1 deletionnet/iucv/iucv.c
- net/key/af_key.c 19 additions, 11 deletionsnet/key/af_key.c
- net/sctp/sm_make_chunk.c 24 additions, 13 deletionsnet/sctp/sm_make_chunk.c
- net/sctp/sm_statefuns.c 37 additions, 11 deletionsnet/sctp/sm_statefuns.c
- net/xfrm/xfrm_output.c 8 additions, 4 deletionsnet/xfrm/xfrm_output.c
Loading
Please register or sign in to comment