SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - hand-made upda...
cieciwa
cieciwa at pld-linux.org
Mon Sep 5 09:31:53 CEST 2005
Author: cieciwa Date: Mon Sep 5 07:31:50 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- hand-made updated for 2.6.13.
---- Files affected:
SOURCES:
linux-2.6-pom-ng-branch.diff (1.1.2.18 -> 1.1.2.19)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.19
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.18 Fri Aug 26 17:56:48 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff Mon Sep 5 09:31:44 2005
@@ -2,7 +2,7 @@
include/linux/netfilter/ipv4/nf_conntrack_icmp.h | 17
include/linux/netfilter/ipv4/nf_conntrack_ipv4.h | 40
include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h | 27
- include/linux/netfilter/nf_conntrack.h | 302 ++
+ include/linux/netfilter/nf_conntrack.h | 302 +
include/linux/netfilter/nf_conntrack_core.h | 72
include/linux/netfilter/nf_conntrack_ftp.h | 59
include/linux/netfilter/nf_conntrack_helper.h | 50
@@ -10,25 +10,27 @@
include/linux/netfilter/nf_conntrack_protocol.h | 105
include/linux/netfilter/nf_conntrack_sctp.h | 30
include/linux/netfilter/nf_conntrack_tcp.h | 63
- include/linux/netfilter/nf_conntrack_tuple.h | 201 +
- include/linux/netfilter/nfnetlink.h | 145 +
- include/linux/netfilter_ipv4.h | 28
- include/linux/netfilter_ipv4/ip_conntrack.h | 161 +
- include/linux/netfilter_ipv4/ip_conntrack_core.h | 15
+ include/linux/netfilter/nf_conntrack_tuple.h | 201
+ include/linux/netfilter/nfnetlink.h | 145
+ include/linux/netfilter_ipv4.h | 34
+ include/linux/netfilter_ipv4/ip_conntrack.h | 166
+ include/linux/netfilter_ipv4/ip_conntrack_core.h | 18
include/linux/netfilter_ipv4/ip_conntrack_h323.h | 38
+ include/linux/netfilter_ipv4/ip_conntrack_helper.h | 7
include/linux/netfilter_ipv4/ip_conntrack_mms.h | 36
- include/linux/netfilter_ipv4/ip_conntrack_pptp.h | 336 +++
- include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h | 114 +
+ include/linux/netfilter_ipv4/ip_conntrack_pptp.h | 336 +
+ include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h | 114
include/linux/netfilter_ipv4/ip_conntrack_protocol.h | 2
include/linux/netfilter_ipv4/ip_conntrack_quake3.h | 22
include/linux/netfilter_ipv4/ip_conntrack_tuple.h | 6
+ include/linux/netfilter_ipv4/ip_nat.h | 3
include/linux/netfilter_ipv4/ip_nat_pptp.h | 11
include/linux/netfilter_ipv4/ip_queue.h | 13
- include/linux/netfilter_ipv4/ip_set.h | 489 ++++
+ include/linux/netfilter_ipv4/ip_set.h | 489 ++
include/linux/netfilter_ipv4/ip_set_iphash.h | 30
include/linux/netfilter_ipv4/ip_set_ipmap.h | 56
include/linux/netfilter_ipv4/ip_set_iptree.h | 39
- include/linux/netfilter_ipv4/ip_set_jhash.h | 148 +
+ include/linux/netfilter_ipv4/ip_set_jhash.h | 148
include/linux/netfilter_ipv4/ip_set_macipmap.h | 38
include/linux/netfilter_ipv4/ip_set_malloc.h | 34
include/linux/netfilter_ipv4/ip_set_nethash.h | 55
@@ -36,7 +38,7 @@
include/linux/netfilter_ipv4/ip_set_prime.h | 34
include/linux/netfilter_ipv4/ip_tables.h | 14
include/linux/netfilter_ipv4/ipt_ACCOUNT.h | 100
- include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 2
+ include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 5
include/linux/netfilter_ipv4/ipt_IPMARK.h | 13
include/linux/netfilter_ipv4/ipt_ROUTE.h | 23
include/linux/netfilter_ipv4/ipt_TTL.h | 21
@@ -50,7 +52,7 @@
include/linux/netfilter_ipv4/ipt_ipv4options.h | 21
include/linux/netfilter_ipv4/ipt_layer7.h | 26
include/linux/netfilter_ipv4/ipt_nth.h | 19
- include/linux/netfilter_ipv4/ipt_osf.h | 151 +
+ include/linux/netfilter_ipv4/ipt_osf.h | 151
include/linux/netfilter_ipv4/ipt_policy.h | 52
include/linux/netfilter_ipv4/ipt_psd.h | 40
include/linux/netfilter_ipv4/ipt_quota.h | 12
@@ -59,6 +61,8 @@
include/linux/netfilter_ipv4/ipt_string.h | 21
include/linux/netfilter_ipv4/ipt_time.h | 18
include/linux/netfilter_ipv4/ipt_u32.h | 40
+ include/linux/netfilter_ipv4/listhelp.h | 1
+ include/linux/netfilter_ipv4/lockhelp.h | 129
include/linux/netfilter_ipv6.h | 3
include/linux/netfilter_ipv6/ip6t_HL.h | 22
include/linux/netfilter_ipv6/ip6t_REJECT.h | 18
@@ -66,550 +70,286 @@
include/linux/netfilter_ipv6/ip6t_fuzzy.h | 21
include/linux/netfilter_ipv6/ip6t_nth.h | 19
include/linux/netfilter_ipv6/ip6t_policy.h | 52
- include/linux/netlink.h | 1
- include/linux/skbuff.h | 19
- include/linux/sysctl.h | 37
- net/Kconfig | 1
+ include/linux/netlink.h | 36
+ include/linux/skbuff.h | 106
+ include/linux/sysctl.h | 59
+ net/Kconfig | 473 +
net/Makefile | 1
- net/core/skbuff.c | 11
- net/ipv4/netfilter/Kconfig | 574 +++++
+ net/core/Makefile | 19
+ net/core/datagram.c | 482 --
+ net/core/dev.c | 3277 -------------
+ net/core/dev_mcast.c | 299 -
+ net/core/dst.c | 285 -
+ net/core/dv.c | 548 --
+ net/core/ethtool.c | 835 ---
+ net/core/filter.c | 392 -
+ net/core/flow.c | 371 -
+ net/core/gen_estimator.c | 250 -
+ net/core/gen_stats.c | 239
+ net/core/iovec.c | 239
+ net/core/link_watch.c | 144
+ net/core/neighbour.c | 2682 -----------
+ net/core/net-sysfs.c | 479 -
+ net/core/netfilter.c | 648 --
+ net/core/netpoll.c | 786 ---
+ net/core/pktgen.c | 3129 -------------
+ net/core/request_sock.c | 64
+ net/core/rtnetlink.c | 729 ---
+ net/core/scm.c | 290 -
+ net/core/skbuff.c | 197
+ net/core/sock.c | 1609 ------
+ net/core/stream.c | 287 -
+ net/core/sysctl_net_core.c | 139
+ net/core/utils.c | 190
+ net/core/wireless.c | 1530 ------
+ net/ipv4/Kconfig | 535 --
+ net/ipv4/Makefile | 43
+ net/ipv4/af_inet.c | 1211 -----
+ net/ipv4/ah4.c | 335 -
+ net/ipv4/arp.c | 1425 -----
+ net/ipv4/datagram.c | 73
+ net/ipv4/devinet.c | 1532 ------
+ net/ipv4/esp4.c | 510 --
+ net/ipv4/fib_frontend.c | 666 --
+ net/ipv4/fib_hash.c | 1087 ----
+ net/ipv4/fib_lookup.h | 44
+ net/ipv4/fib_rules.c | 438 -
+ net/ipv4/fib_semantics.c | 1339 -----
+ net/ipv4/fib_trie.c | 2612 ----------
+ net/ipv4/icmp.c | 1148 ----
+ net/ipv4/igmp.c | 2487 ----------
+ net/ipv4/inetpeer.c | 463 -
+ net/ipv4/ip_forward.c | 127
+ net/ipv4/ip_fragment.c | 689 --
+ net/ipv4/ip_gre.c | 1305 -----
+ net/ipv4/ip_input.c | 11
+ net/ipv4/ip_options.c | 625 --
+ net/ipv4/ip_output.c | 27
+ net/ipv4/ip_sockglue.c | 1096 ----
+ net/ipv4/ipcomp.c | 519 --
+ net/ipv4/ipconfig.c | 1509 ------
+ net/ipv4/ipip.c | 949 ---
+ net/ipv4/ipmr.c | 17
+ net/ipv4/ipvs/Kconfig | 244 -
+ net/ipv4/ipvs/Makefile | 34
+ net/ipv4/ipvs/ip_vs_app.c | 658 --
+ net/ipv4/ipvs/ip_vs_conn.c | 903 ---
+ net/ipv4/ipvs/ip_vs_core.c | 1191 ----
+ net/ipv4/ipvs/ip_vs_ctl.c | 2396 ---------
+ net/ipv4/ipvs/ip_vs_dh.c | 258 -
+ net/ipv4/ipvs/ip_vs_est.c | 200
+ net/ipv4/ipvs/ip_vs_ftp.c | 400 -
+ net/ipv4/ipvs/ip_vs_lblc.c | 624 --
+ net/ipv4/ipvs/ip_vs_lblcr.c | 888 ---
+ net/ipv4/ipvs/ip_vs_lc.c | 123
+ net/ipv4/ipvs/ip_vs_nq.c | 161
+ net/ipv4/ipvs/ip_vs_proto.c | 241 -
+ net/ipv4/ipvs/ip_vs_proto_ah.c | 177
+ net/ipv4/ipvs/ip_vs_proto_esp.c | 175
+ net/ipv4/ipvs/ip_vs_proto_tcp.c | 640 --
+ net/ipv4/ipvs/ip_vs_proto_udp.c | 427 -
+ net/ipv4/ipvs/ip_vs_rr.c | 118
+ net/ipv4/ipvs/ip_vs_sched.c | 251 -
+ net/ipv4/ipvs/ip_vs_sed.c | 163
+ net/ipv4/ipvs/ip_vs_sh.c | 255 -
+ net/ipv4/ipvs/ip_vs_sync.c | 892 ---
+ net/ipv4/ipvs/ip_vs_wlc.c | 151
+ net/ipv4/ipvs/ip_vs_wrr.c | 235
+ net/ipv4/ipvs/ip_vs_xmit.c | 561 --
+ net/ipv4/multipath.c | 55
+ net/ipv4/multipath_drr.c | 251 -
+ net/ipv4/multipath_random.c | 130
+ net/ipv4/multipath_rr.c | 97
+ net/ipv4/multipath_wrandom.c | 346 -
+ net/ipv4/netfilter/Kconfig | 574 ++
net/ipv4/netfilter/Makefile | 69
- net/ipv4/netfilter/asn1_per.c | 353 +++
+ net/ipv4/netfilter/arp_tables.c | 1
+ net/ipv4/netfilter/asn1_per.c | 353 +
net/ipv4/netfilter/asn1_per.h | 83
- net/ipv4/netfilter/ip_conntrack_core.c | 50
- net/ipv4/netfilter/ip_conntrack_ftp.c | 12
- net/ipv4/netfilter/ip_conntrack_h323.c | 447 ++++
+ net/ipv4/netfilter/ip_conntrack_amanda.c | 17
+ net/ipv4/netfilter/ip_conntrack_core.c | 203
+ net/ipv4/netfilter/ip_conntrack_ftp.c | 33
+ net/ipv4/netfilter/ip_conntrack_h323.c | 447 +
net/ipv4/netfilter/ip_conntrack_h323_core.c | 37
- net/ipv4/netfilter/ip_conntrack_h323_h225.c | 405 +++
- net/ipv4/netfilter/ip_conntrack_h323_h245.c | 959 ++++++++
- net/ipv4/netfilter/ip_conntrack_mms.c | 352 +++
- net/ipv4/netfilter/ip_conntrack_pptp.c | 790 +++++++
+ net/ipv4/netfilter/ip_conntrack_h323_h225.c | 405 +
+ net/ipv4/netfilter/ip_conntrack_h323_h245.c | 959 ++++
+ net/ipv4/netfilter/ip_conntrack_irc.c | 15
+ net/ipv4/netfilter/ip_conntrack_mms.c | 352 +
+ net/ipv4/netfilter/ip_conntrack_pptp.c | 790 +++
net/ipv4/netfilter/ip_conntrack_pptp_priv.h | 24
net/ipv4/netfilter/ip_conntrack_proto_generic.c | 2
- net/ipv4/netfilter/ip_conntrack_proto_gre.c | 369 +++
+ net/ipv4/netfilter/ip_conntrack_proto_gre.c | 369 +
net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3
- net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 4
- net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 6
- net/ipv4/netfilter/ip_conntrack_proto_udp.c | 5
- net/ipv4/netfilter/ip_conntrack_quake3.c | 202 +
- net/ipv4/netfilter/ip_conntrack_standalone.c | 14
- net/ipv4/netfilter/ip_nat_h323.c | 196 +
- net/ipv4/netfilter/ip_nat_mms.c | 195 +
- net/ipv4/netfilter/ip_nat_pptp.c | 388 +++
- net/ipv4/netfilter/ip_nat_proto_gre.c | 214 +
+ net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 27
+ net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 33
+ net/ipv4/netfilter/ip_conntrack_proto_udp.c | 6
+ net/ipv4/netfilter/ip_conntrack_quake3.c | 202
+ net/ipv4/netfilter/ip_conntrack_standalone.c | 38
+ net/ipv4/netfilter/ip_conntrack_tftp.c | 8
+ net/ipv4/netfilter/ip_nat_amanda.c | 4
+ net/ipv4/netfilter/ip_nat_core.c | 32
+ net/ipv4/netfilter/ip_nat_ftp.c | 4
+ net/ipv4/netfilter/ip_nat_h323.c | 196
+ net/ipv4/netfilter/ip_nat_helper.c | 13
+ net/ipv4/netfilter/ip_nat_irc.c | 4
+ net/ipv4/netfilter/ip_nat_mms.c | 195
+ net/ipv4/netfilter/ip_nat_pptp.c | 388 +
+ net/ipv4/netfilter/ip_nat_proto_gre.c | 214
+ net/ipv4/netfilter/ip_nat_proto_icmp.c | 7
+ net/ipv4/netfilter/ip_nat_proto_tcp.c | 3
+ net/ipv4/netfilter/ip_nat_proto_udp.c | 3
net/ipv4/netfilter/ip_nat_quake3.c | 97
- net/ipv4/netfilter/ip_queue.c | 35
- net/ipv4/netfilter/ip_set.c | 1989 ++++++++++++++++++
- net/ipv4/netfilter/ip_set_iphash.c | 379 +++
- net/ipv4/netfilter/ip_set_ipmap.c | 313 ++
- net/ipv4/netfilter/ip_set_iptree.c | 510 ++++
- net/ipv4/netfilter/ip_set_macipmap.c | 338 +++
- net/ipv4/netfilter/ip_set_nethash.c | 449 ++++
- net/ipv4/netfilter/ip_set_portmap.c | 325 ++
- net/ipv4/netfilter/ip_tables.c | 2
- net/ipv4/netfilter/ipt_ACCOUNT.c | 1103 +++++++++
+ net/ipv4/netfilter/ip_nat_rule.c | 4
+ net/ipv4/netfilter/ip_nat_standalone.c | 9
+ net/ipv4/netfilter/ip_nat_tftp.c | 4
+ net/ipv4/netfilter/ip_queue.c | 42
+ net/ipv4/netfilter/ip_set.c | 1989 ++++++++
+ net/ipv4/netfilter/ip_set_iphash.c | 379 +
+ net/ipv4/netfilter/ip_set_ipmap.c | 313 +
+ net/ipv4/netfilter/ip_set_iptree.c | 510 ++
+ net/ipv4/netfilter/ip_set_macipmap.c | 338 +
+ net/ipv4/netfilter/ip_set_nethash.c | 449 +
+ net/ipv4/netfilter/ip_set_portmap.c | 325 +
+ net/ipv4/netfilter/ip_tables.c | 3
+ net/ipv4/netfilter/ipt_ACCOUNT.c | 1103 ++++
net/ipv4/netfilter/ipt_CLASSIFY.c | 31
- net/ipv4/netfilter/ipt_CLUSTERIP.c | 7
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 51
+ net/ipv4/netfilter/ipt_ECN.c | 17
net/ipv4/netfilter/ipt_IPMARK.c | 81
net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c | 89
- net/ipv4/netfilter/ipt_REJECT.c | 147 +
- net/ipv4/netfilter/ipt_ROUTE.c | 464 ++++
- net/ipv4/netfilter/ipt_SET.c | 128 +
- net/ipv4/netfilter/ipt_TARPIT.c | 295 ++
- net/ipv4/netfilter/ipt_TTL.c | 120 +
- net/ipv4/netfilter/ipt_ULOG.c | 4
- net/ipv4/netfilter/ipt_XOR.c | 117 +
- net/ipv4/netfilter/ipt_account.c | 937 ++++++++
+ net/ipv4/netfilter/ipt_MASQUERADE.c | 10
+ net/ipv4/netfilter/ipt_REJECT.c | 160
+ net/ipv4/netfilter/ipt_ROUTE.c | 464 +
+ net/ipv4/netfilter/ipt_SET.c | 128
+ net/ipv4/netfilter/ipt_TARPIT.c | 295 +
+ net/ipv4/netfilter/ipt_TCPMSS.c | 7
+ net/ipv4/netfilter/ipt_TTL.c | 120
+ net/ipv4/netfilter/ipt_ULOG.c | 19
+ net/ipv4/netfilter/ipt_XOR.c | 117
+ net/ipv4/netfilter/ipt_account.c | 937 +++
net/ipv4/netfilter/ipt_addrtype.c | 4
- net/ipv4/netfilter/ipt_connlimit.c | 228 ++
- net/ipv4/netfilter/ipt_fuzzy.c | 185 +
- net/ipv4/netfilter/ipt_geoip.c | 275 ++
- net/ipv4/netfilter/ipt_ipp2p.c | 644 +++++
+ net/ipv4/netfilter/ipt_connlimit.c | 228
+ net/ipv4/netfilter/ipt_fuzzy.c | 185
+ net/ipv4/netfilter/ipt_geoip.c | 275 +
+ net/ipv4/netfilter/ipt_hashlimit.c | 17
+ net/ipv4/netfilter/ipt_helper.c | 4
+ net/ipv4/netfilter/ipt_ipp2p.c | 644 ++
net/ipv4/netfilter/ipt_iprange.c | 12
- net/ipv4/netfilter/ipt_ipv4options.c | 172 +
- net/ipv4/netfilter/ipt_layer7.c | 552 ++++
- net/ipv4/netfilter/ipt_nth.c | 166 +
- net/ipv4/netfilter/ipt_osf.c | 854 +++++++
- net/ipv4/netfilter/ipt_policy.c | 176 +
- net/ipv4/netfilter/ipt_psd.c | 358 +++
+ net/ipv4/netfilter/ipt_ipv4options.c | 172
+ net/ipv4/netfilter/ipt_layer7.c | 552 ++
+ net/ipv4/netfilter/ipt_nth.c | 166
+ net/ipv4/netfilter/ipt_osf.c | 854 +++
+ net/ipv4/netfilter/ipt_policy.c | 176
+ net/ipv4/netfilter/ipt_psd.c | 358 +
net/ipv4/netfilter/ipt_quota.c | 96
net/ipv4/netfilter/ipt_realm.c | 12
net/ipv4/netfilter/ipt_recent.c | 11
- net/ipv4/netfilter/ipt_set.c | 112 +
- net/ipv4/netfilter/ipt_string.c | 183 +
- net/ipv4/netfilter/ipt_time.c | 179 +
- net/ipv4/netfilter/ipt_u32.c | 233 ++
- net/ipv4/netfilter/ipt_unclean.c | 611 +++++
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 549 ++++
- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 299 ++
- net/ipv4/netfilter/regexp/regexp.c | 1195 ++++++++++
+ net/ipv4/netfilter/ipt_set.c | 112
+ net/ipv4/netfilter/ipt_string.c | 183
+ net/ipv4/netfilter/ipt_time.c | 179
+ net/ipv4/netfilter/ipt_u32.c | 233
+ net/ipv4/netfilter/ipt_unclean.c | 611 ++
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 549 ++
+ net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 299 +
+ net/ipv4/netfilter/regexp/regexp.c | 1195 ++++
net/ipv4/netfilter/regexp/regexp.h | 40
net/ipv4/netfilter/regexp/regmagic.h | 5
net/ipv4/netfilter/regexp/regsub.c | 95
- net/ipv6/ip6_output.c | 6
+ net/ipv4/proc.c | 382 -
+ net/ipv4/protocol.c | 101
+ net/ipv4/raw.c | 894 ---
+ net/ipv4/route.c | 3206 -------------
+ net/ipv4/syncookies.c | 280 -
+ net/ipv4/sysctl_net_ipv4.c | 683 --
+ net/ipv4/tcp.c | 2387 ---------
+ net/ipv4/tcp_bic.c | 331 -
+ net/ipv4/tcp_cong.c | 237
+ net/ipv4/tcp_diag.c | 790 ---
+ net/ipv4/tcp_highspeed.c | 181
+ net/ipv4/tcp_htcp.c | 289 -
+ net/ipv4/tcp_hybla.c | 187
+ net/ipv4/tcp_input.c | 4315 ------------------
+ net/ipv4/tcp_ipv4.c | 2658 -----------
+ net/ipv4/tcp_minisocks.c | 1077 ----
+ net/ipv4/tcp_output.c | 2049 --------
+ net/ipv4/tcp_scalable.c | 68
+ net/ipv4/tcp_timer.c | 651 --
+ net/ipv4/tcp_vegas.c | 411 -
+ net/ipv4/tcp_westwood.c | 259 -
+ net/ipv4/udp.c | 1575 ------
+ net/ipv4/xfrm4_input.c | 160
+ net/ipv4/xfrm4_output.c | 145
+ net/ipv4/xfrm4_policy.c | 323 -
+ net/ipv4/xfrm4_state.c | 135
+ net/ipv4/xfrm4_tunnel.c | 143
+ net/ipv6/Kconfig | 98
+ net/ipv6/Makefile | 25
+ net/ipv6/addrconf.c | 3605 ---------------
+ net/ipv6/af_inet6.c | 867 ---
+ net/ipv6/ah6.c | 478 -
+ net/ipv6/anycast.c | 594 --
+ net/ipv6/datagram.c | 600 --
+ net/ipv6/esp6.c | 424 -
+ net/ipv6/exthdrs.c | 575 --
+ net/ipv6/exthdrs_core.c | 106
+ net/ipv6/icmp.c | 828 ---
+ net/ipv6/ip6_fib.c | 1226 -----
+ net/ipv6/ip6_flowlabel.c | 707 --
+ net/ipv6/ip6_input.c | 9
+ net/ipv6/ip6_output.c | 17
+ net/ipv6/ip6_tunnel.c | 1192 ----
+ net/ipv6/ipcomp6.c | 519 --
+ net/ipv6/ipv6_sockglue.c | 708 --
net/ipv6/ipv6_syms.c | 2
+ net/ipv6/mcast.c | 2540 ----------
+ net/ipv6/ndisc.c | 1690 -------
net/ipv6/netfilter/Kconfig | 109
net/ipv6/netfilter/Makefile | 14
- net/ipv6/netfilter/ip6t_HL.c | 111 +
- net/ipv6/netfilter/ip6t_REJECT.c | 304 ++
- net/ipv6/netfilter/ip6t_ROUTE.c | 308 ++
- net/ipv6/netfilter/ip6t_ULOG.c | 142 +
- net/ipv6/netfilter/ip6t_fuzzy.c | 188 +
- net/ipv6/netfilter/ip6t_nth.c | 173 +
- net/ipv6/netfilter/ip6t_policy.c | 200 +
- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 630 +++++
- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 271 ++
- net/ipv6/netfilter/nf_conntrack_reasm.c | 887 ++++++++
+ net/ipv6/netfilter/ip6_queue.c | 9
+ net/ipv6/netfilter/ip6_tables.c | 1
+ net/ipv6/netfilter/ip6t_HL.c | 111
+ net/ipv6/netfilter/ip6t_LOG.c | 57
+ net/ipv6/netfilter/ip6t_REJECT.c | 304 +
+ net/ipv6/netfilter/ip6t_ROUTE.c | 308 +
+ net/ipv6/netfilter/ip6t_ULOG.c | 142
+ net/ipv6/netfilter/ip6t_fuzzy.c | 188
+ net/ipv6/netfilter/ip6t_nth.c | 173
+ net/ipv6/netfilter/ip6t_policy.c | 200
+ net/ipv6/netfilter/ip6table_raw.c | 6
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 630 ++
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 271 +
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 887 +++
+ net/ipv6/proc.c | 303 -
+ net/ipv6/protocol.c | 86
+ net/ipv6/raw.c | 1185 ----
+ net/ipv6/reassembly.c | 771 ---
+ net/ipv6/route.c | 2136 --------
+ net/ipv6/sit.c | 850 ---
+ net/ipv6/sysctl_net_ipv6.c | 125
+ net/ipv6/tcp_ipv6.c | 2271 ---------
+ net/ipv6/udp.c | 1075 ----
+ net/ipv6/xfrm6_input.c | 150
+ net/ipv6/xfrm6_output.c | 144
+ net/ipv6/xfrm6_policy.c | 342 -
+ net/ipv6/xfrm6_state.c | 136
+ net/ipv6/xfrm6_tunnel.c | 543 --
net/netfilter/Kconfig | 74
net/netfilter/Makefile | 9
- net/netfilter/nf_conntrack_core.c | 1390 ++++++++++++
- net/netfilter/nf_conntrack_ftp.c | 690 ++++++
+ net/netfilter/nf_conntrack_core.c | 1390 +++++
+ net/netfilter/nf_conntrack_ftp.c | 690 ++
net/netfilter/nf_conntrack_l3proto_generic.c | 99
net/netfilter/nf_conntrack_proto_generic.c | 85
- net/netfilter/nf_conntrack_proto_sctp.c | 668 ++++++
- net/netfilter/nf_conntrack_proto_tcp.c | 1146 ++++++++++
- net/netfilter/nf_conntrack_proto_udp.c | 212 +
- net/netfilter/nf_conntrack_standalone.c | 821 +++++++
- net/netfilter/nfnetlink.c | 343 +++
+ net/netfilter/nf_conntrack_proto_sctp.c | 668 ++
+ net/netfilter/nf_conntrack_proto_tcp.c | 1146 ++++
+ net/netfilter/nf_conntrack_proto_udp.c | 212
+ net/netfilter/nf_conntrack_standalone.c | 821 +++
+ net/netfilter/nfnetlink.c | 343 +
status | 44
- 174 files changed, 33694 insertions(+), 102 deletions(-)
+ 347 files changed, 34706 insertions(+), 107479 deletions(-)
-Index: include/linux/netfilter_ipv6/ip6t_fuzzy.h
-===================================================================
---- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6284)
-@@ -0,0 +1,21 @@
-+#ifndef _IP6T_FUZZY_H
-+#define _IP6T_FUZZY_H
-+
-+#include <linux/param.h>
-+#include <linux/types.h>
-+
-+#define MAXFUZZYRATE 10000000
-+#define MINFUZZYRATE 3
-+
-+struct ip6t_fuzzy_info {
-+ u_int32_t minimum_rate;
-+ u_int32_t maximum_rate;
-+ u_int32_t packets_total;
-+ u_int32_t bytes_total;
-+ u_int32_t previous_time;
-+ u_int32_t present_time;
-+ u_int32_t mean_rate;
-+ u_int8_t acceptance_rate;
-+};
-+
-+#endif /*_IP6T_FUZZY_H*/
-Index: include/linux/netfilter_ipv6/ip6t_nth.h
-===================================================================
---- include/linux/netfilter_ipv6/ip6t_nth.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6284)
-@@ -0,0 +1,19 @@
-+#ifndef _IP6T_NTH_H
-+#define _IP6T_NTH_H
-+
-+#include <linux/param.h>
-+#include <linux/types.h>
-+
-+#ifndef IP6T_NTH_NUM_COUNTERS
-+#define IP6T_NTH_NUM_COUNTERS 16
-+#endif
-+
-+struct ip6t_nth_info {
-+ u_int8_t every;
-+ u_int8_t not;
-+ u_int8_t startat;
-+ u_int8_t counter;
-+ u_int8_t packet;
-+};
-+
-+#endif /*_IP6T_NTH_H*/
-Index: include/linux/netfilter_ipv6/ip6t_ROUTE.h
-===================================================================
---- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6284)
-@@ -0,0 +1,23 @@
-+/* Header file for iptables ip6t_ROUTE target
-+ *
-+ * (C) 2003 by Cédric de Launois <delaunois at info.ucl.ac.be>
-+ *
-+ * This software is distributed under GNU GPL v2, 1991
-+ */
-+#ifndef _IPT_ROUTE_H_target
-+#define _IPT_ROUTE_H_target
-+
-+#define IP6T_ROUTE_IFNAMSIZ 16
-+
-+struct ip6t_route_target_info {
-+ char oif[IP6T_ROUTE_IFNAMSIZ]; /* Output Interface Name */
-+ char iif[IP6T_ROUTE_IFNAMSIZ]; /* Input Interface Name */
-+ u_int32_t gw[4]; /* IPv6 address of gateway */
-+ u_int8_t flags;
-+};
-+
-+/* Values for "flags" field */
-+#define IP6T_ROUTE_CONTINUE 0x01
-+#define IP6T_ROUTE_TEE 0x02
-+
-+#endif /*_IP6T_ROUTE_H_target*/
-Index: include/linux/netfilter_ipv6/ip6t_policy.h
-===================================================================
---- include/linux/netfilter_ipv6/ip6t_policy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6284)
-@@ -0,0 +1,52 @@
-+#ifndef _IP6T_POLICY_H
-+#define _IP6T_POLICY_H
-+
-+#define POLICY_MAX_ELEM 4
-+
-+enum ip6t_policy_flags
-+{
-+ POLICY_MATCH_IN = 0x1,
-+ POLICY_MATCH_OUT = 0x2,
-+ POLICY_MATCH_NONE = 0x4,
-+ POLICY_MATCH_STRICT = 0x8,
-+};
-+
-+enum ip6t_policy_modes
-+{
-+ POLICY_MODE_TRANSPORT,
-+ POLICY_MODE_TUNNEL
-+};
-+
-+struct ip6t_policy_spec
-+{
-+ u_int8_t saddr:1,
-+ daddr:1,
-+ proto:1,
-+ mode:1,
-+ spi:1,
-+ reqid:1;
-+};
-+
-+struct ip6t_policy_elem
-+{
-+ struct in6_addr saddr;
-+ struct in6_addr smask;
-+ struct in6_addr daddr;
-+ struct in6_addr dmask;
-+ u_int32_t spi;
-+ u_int32_t reqid;
-+ u_int8_t proto;
-+ u_int8_t mode;
-+
-+ struct ip6t_policy_spec match;
-+ struct ip6t_policy_spec invert;
-+};
-+
-+struct ip6t_policy_info
-+{
-+ struct ip6t_policy_elem pol[POLICY_MAX_ELEM];
-+ u_int16_t flags;
-+ u_int16_t len;
-+};
-+
-+#endif /* _IP6T_POLICY_H */
-Index: include/linux/netfilter_ipv6/ip6t_HL.h
-===================================================================
---- include/linux/netfilter_ipv6/ip6t_HL.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6284)
-@@ -0,0 +1,22 @@
-+/* Hop Limit modification module for ip6tables
-+ * Maciej Soltysiak <solt at dns.toxicfilms.tv>
-+ * Based on HW's TTL module */
-+
-+#ifndef _IP6T_HL_H
-+#define _IP6T_HL_H
-+
-+enum {
-+ IP6T_HL_SET = 0,
-+ IP6T_HL_INC,
-+ IP6T_HL_DEC
-+};
-+
-+#define IP6T_HL_MAXMODE IP6T_HL_DEC
-+
-+struct ip6t_HL_info {
-+ u_int8_t mode;
-+ u_int8_t hop_limit;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.18&r2=1.1.2.19&f=u
More information about the pld-cvs-commit
mailing list