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: rtnetlink: make SR-IOV VF interface symmetric sctp: delete active ICMP proto unreachable timer when free transport tcp: fix MD5 (RFC2385) support
Showing
- include/linux/if_link.h 19 additions, 4 deletionsinclude/linux/if_link.h
- include/net/tcp.h 3 additions, 18 deletionsinclude/net/tcp.h
- net/core/rtnetlink.c 110 additions, 49 deletionsnet/core/rtnetlink.c
- net/ipv4/tcp.c 24 additions, 10 deletionsnet/ipv4/tcp.c
- net/sctp/transport.c 4 additions, 0 deletionsnet/sctp/transport.c
Loading
Please register or sign in to comment