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

2026-09-14 18:22:56 +00:00 · 2005-11-10 21:24:21 -08:00 · 2005-11-10 21:24:21 -08:00 · 79ffeeb9e6
commit 79ffeeb9e6
parent a5aac37f1c 6a438bbe68
19 changed files with 413 additions and 199 deletions
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- 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_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_timer.c
+++ b/net/ipv4/tcp_timer.c
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c