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: [LRO]: fix lro_gen_skb() alignment [TCP]: NAGLE_PUSH seems to be a wrong way around [TCP]: Move prior_in_flight collect to more robust place [TCP] FRTO: Use of existing funcs make code more obvious & robust [IRDA]: Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS [ROSE]: Trivial compilation CONFIG_INET=n case [IPVS]: Fix sched registration race when checking for name collision. [IPVS]: Don't leak sysctl tables if the scheduler registration fails.
Showing
- drivers/net/myri10ge/myri10ge.c 1 addition, 0 deletionsdrivers/net/myri10ge/myri10ge.c
- include/linux/inet_lro.h 3 additions, 0 deletionsinclude/linux/inet_lro.h
- net/ipv4/inet_lro.c 2 additions, 1 deletionnet/ipv4/inet_lro.c
- net/ipv4/ipvs/ip_vs_lblc.c 6 additions, 1 deletionnet/ipv4/ipvs/ip_vs_lblc.c
- net/ipv4/ipvs/ip_vs_lblcr.c 6 additions, 1 deletionnet/ipv4/ipvs/ip_vs_lblcr.c
- net/ipv4/ipvs/ip_vs_sched.c 14 additions, 13 deletionsnet/ipv4/ipvs/ip_vs_sched.c
- net/ipv4/tcp_input.c 6 additions, 11 deletionsnet/ipv4/tcp_input.c
- net/ipv4/tcp_output.c 1 addition, 2 deletionsnet/ipv4/tcp_output.c
- net/irda/ircomm/ircomm_tty.c 1 addition, 1 deletionnet/irda/ircomm/ircomm_tty.c
- net/rose/rose_dev.c 1 addition, 1 deletionnet/rose/rose_dev.c
Loading
Please register or sign in to comment