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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [UDP]: Fix reversed logic in udp_get_port(). [IPV6]: Dumb typo in generic csum_ipv6_magic() [SCTP]: make 2 functions static [SCTP]: Fix typo adaption -> adaptation as per the latest API draft. [SCTP]: Don't export include/linux/sctp.h to userspace. [TCP]: Fix ambiguity in the `before' relation. [ATM] drivers/atm/fore200e.c: Cleanups. [ATM]: Remove dead ATM_TNETA1570 option. NetLabel: correctly fill in unused CIPSOv4 level and category mappings NetLabel: perform input validation earlier on CIPSOv4 DOI add ops
2026-09-20 18:15:29 +00:00 · 2006-12-22 14:14:17 -08:00 · 2006-12-22 14:14:17 -08:00 · f2a67a5769
commit f2a67a5769
parent 719d34027e 5c668704b7
18 changed files with 188 additions and 212 deletions
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sctp/ulpevent.h
+++ b/include/net/sctp/ulpevent.h
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c