Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2026-09-14 18:22:56 +00:00 · 2005-06-23 17:26:31 -07:00 · 2005-06-23 17:26:31 -07:00 · a39451c17f
commit a39451c17f
parent adb7ee3746 0e57976b63
24 changed files with 2304 additions and 1060 deletions
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/tcp.txt
+++ b/Documentation/networking/tcp.txt
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/tcp_diag.h
+++ b/include/linux/tcp_diag.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
--- a/net/ipv4/Makefile
+++ b/net/ipv4/Makefile
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
--- a/net/ipv4/tcp_highspeed.c
+++ b/net/ipv4/tcp_highspeed.c
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
--- a/net/ipv4/tcp_hybla.c
+++ b/net/ipv4/tcp_hybla.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/tcp_scalable.c
+++ b/net/ipv4/tcp_scalable.c
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
--- a/net/ipv4/tcp_westwood.c
+++ b/net/ipv4/tcp_westwood.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c