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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl [IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP [NET] gso: Fix GSO feature mask in sk_setup_caps [TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules) [NET]: Fix comparisons of unsigned < 0. [NET]: Make net watchdog timers 1 sec jiffy aligned. [ATM]: Fix warning. [TCP]: Use default 32768-61000 outgoing port range in all cases. [AF_UNIX]: Fix datagram connect race causing an OOPS. [TG3]: Fix link problem on Dell's onboard 5906. [AF_UNIX]: Make socket locking much less confusing.
2026-09-26 18:16:26 +00:00 · 2007-06-04 13:26:49 -07:00 · 2007-06-04 13:26:49 -07:00 · 45efebf249
commit 45efebf249
parent 4acbab8468 6e1d91039b
21 changed files with 132 additions and 96 deletions
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
--- a/net/core/sock.c
+++ b/net/core/sock.c
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
--- a/net/ipv4/datagram.c
+++ b/net/ipv4/datagram.c
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.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/udp.c
+++ b/net/ipv4/udp.c
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
--- a/net/sctp/debug.c
+++ b/net/sctp/debug.c
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c