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: [DCCP]: Update documentation references. [ATM] horizon: read_bia() needs to be __devinit [NETFILTER]: Fix ip6_tables extension header bypass bug [NETFILTER]: Fix ip6_tables protocol bypass bug [XFRM]: Fix xfrm_state accounting [IPV4] ipconfig: fix RARP ic_servaddr breakage
2026-09-18 18:15:59 +00:00 · 2006-10-24 22:01:33 -07:00 · 2006-10-24 22:01:33 -07:00 · 9eed286792
commit 9eed286792
parent 2099c99e3b 0e64e94e47
19 changed files with 76 additions and 52 deletions
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
--- a/net/ipv6/netfilter/ip6t_ah.c
+++ b/net/ipv6/netfilter/ip6t_ah.c
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/net/ipv6/netfilter/ip6t_hbh.c
--- a/net/ipv6/netfilter/ip6t_rt.c
+++ b/net/ipv6/netfilter/ip6t_rt.c
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c