-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack.h 2004-01-18 00:04:34.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack.h 2004-07-14 12:50:38.273551592 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-19 21:31:32.676498552 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-19 21:32:30.805661576 +0200
@@ -49,10 +49,12 @@
#include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
struct ip_ct_tcp tcp;
struct ip_ct_icmp icmp;
};
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_sctp.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 2004-08-19 21:32:30.808661120 +0200
@@ -0,0 +1,25 @@
+#ifndef _IP_CONNTRACK_SCTP_H
+#define _IP_CONNTRACK_SCTP_H
+};
+
+#endif /* _IP_CONNTRACK_SCTP_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-01-05 19:42:34.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-07-14 12:46:47.012708584 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-19 21:31:32.670499464 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-19 21:32:30.810660816 +0200
@@ -25,6 +25,9 @@
struct {
u_int16_t id;
} u;
/* The protocol. */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_logging.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_logging.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_logging.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_logging.h 2004-07-14 12:47:56.539138960 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_logging.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_logging.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_logging.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_logging.h 2004-08-19 21:32:30.813660360 +0200
@@ -0,0 +1,5 @@
+/* IPv4 macros for the internal logging interface. */
+#ifndef __IP_LOGGING_H
+#define __IP_LOGGING_H
+
+#endif /*__IP_LOGGING_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_queue.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_queue.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_queue.h 2004-06-09 14:00:52.000000000 +0200
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_queue.h 2004-07-14 12:48:22.756153368 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_queue.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_queue.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_queue.h 2004-08-19 21:31:32.665500224 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_queue.h 2004-08-19 21:32:30.816659904 +0200
@@ -7,7 +7,7 @@
#ifndef _IP_QUEUE_H
#define _IP_QUEUE_H
+#define IPQM_MAX (IPQM_BASE + 5)
#endif /*_IP_QUEUE_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_tables.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_tables.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ip_tables.h 2004-06-23 23:52:57.000000000 +0200
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ip_tables.h 2004-07-14 12:48:40.502455520 +0200
-@@ -276,8 +276,6 @@
- struct ipt_entry entrytable[0];
- };
-
--extern struct semaphore ipt_mutex;
--
- /* Standard return verdict, or do jump. */
- #define IPT_STANDARD_TARGET ""
- /* Error verdict. */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_account.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_account.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_account.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_account.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_account.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_account.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_account.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_account.h 2004-08-19 21:32:35.740911304 +0200
@@ -0,0 +1,21 @@
+/*
+ * accounting match (ipt_account.c)
+};
+
+#endif
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_addrtype.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_addrtype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_addrtype.h 2004-07-14 11:50:45.000000000 +0200
-@@ -0,0 +1,11 @@
-+#ifndef _IPT_ADDRTYPE_H
-+#define _IPT_ADDRTYPE_H
-+
-+struct ipt_addrtype_info {
-+ u_int16_t source; /* source-type mask */
-+ u_int16_t dest; /* dest-type mask */
-+ u_int32_t invert_source;
-+ u_int32_t invert_dest;
-+};
-+
-+#endif
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connlimit.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connlimit.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_connlimit.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_connlimit.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_connlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_connlimit.h 2004-08-19 21:32:37.256680872 +0200
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
+ struct ipt_connlimit_data *data;
+};
+#endif /* _IPT_CONNLIMIT_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connmark.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_connmark.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_connmark.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_connmark.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_connmark.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_connmark.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_connmark.h 2004-08-19 21:32:37.257680720 +0200
@@ -0,0 +1,18 @@
+#ifndef _IPT_CONNMARK_H
+#define _IPT_CONNMARK_H
+};
+
+#endif /*_IPT_CONNMARK_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_CONNMARK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_CONNMARK.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2004-08-19 21:32:37.258680568 +0200
@@ -0,0 +1,25 @@
+#ifndef _IPT_CONNMARK_H_target
+#define _IPT_CONNMARK_H_target
+};
+
+#endif /*_IPT_CONNMARK_H_target*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_dstlimit.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_dstlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_dstlimit.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_dstlimit.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_dstlimit.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_dstlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_dstlimit.h 2004-08-19 21:32:37.273678288 +0200
@@ -0,0 +1,39 @@
+#ifndef _IPT_DSTLIMIT_H
+#define _IPT_DSTLIMIT_H
+ } u;
+};
+#endif /*_IPT_DSTLIMIT_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_fuzzy.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_fuzzy.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_fuzzy.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_fuzzy.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_fuzzy.h 2004-08-19 21:32:37.275677984 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
+};
+
+#endif /*_IPT_FUZZY_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IMQ.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_IMQ.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_IMQ.h 2004-08-19 21:32:37.277677680 +0200
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
+};
+
+#endif /* _IPT_IMQ_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IPMARK.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_IPMARK.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_IPMARK.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_IPMARK.h 2004-08-19 21:32:37.280677224 +0200
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
+#define IPT_IPMARK_DST 1
+
+#endif /*_IPT_IPMARK_H_target*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ipv4options.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ipv4options.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ipv4options.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_ipv4options.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_ipv4options.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_ipv4options.h 2004-08-19 21:32:37.282676920 +0200
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
+
+
+#endif /* __ipt_ipv4options_h_included__ */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_layer7.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_layer7.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_layer7.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_layer7.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_layer7.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_layer7.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_layer7.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_layer7.h 2004-08-19 21:32:37.284676616 +0200
@@ -0,0 +1,26 @@
+/*
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
+};
+
+#endif /* _IPT_LAYER7_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_mport.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_mport.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_mport.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_mport.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_mport.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_mport.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_mport.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_mport.h 2004-08-19 21:32:37.286676312 +0200
@@ -0,0 +1,24 @@
+#ifndef _IPT_MPORT_H
+#define _IPT_MPORT_H
+ u_int16_t ports[IPT_MULTI_PORTS]; /* Ports */
+};
+#endif /*_IPT_MPORT_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_nth.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_nth.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_nth.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_nth.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_nth.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_nth.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_nth.h 2004-08-19 21:32:37.289675856 +0200
@@ -0,0 +1,19 @@
+#ifndef _IPT_NTH_H
+#define _IPT_NTH_H
+};
+
+#endif /*_IPT_NTH_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_policy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_policy.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_policy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_policy.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_policy.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_policy.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_policy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_policy.h 2004-08-19 21:32:37.291675552 +0200
@@ -0,0 +1,52 @@
+#ifndef _IPT_POLICY_H
+#define _IPT_POLICY_H
+};
+
+#endif /* _IPT_POLICY_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_psd.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_psd.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_psd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_psd.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_psd.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_psd.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_psd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_psd.h 2004-08-19 21:32:37.293675248 +0200
@@ -0,0 +1,40 @@
+#ifndef _IPT_PSD_H
+#define _IPT_PSD_H
+};
+
+#endif /*_IPT_PSD_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_quota.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_quota.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_quota.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_quota.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_quota.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_quota.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_quota.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_quota.h 2004-08-19 21:32:37.295674944 +0200
@@ -0,0 +1,11 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
+};
+
+#endif /*_IPT_QUOTA_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_realm.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_realm.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_realm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_realm.h 2004-07-14 11:50:45.000000000 +0200
-@@ -0,0 +1,10 @@
-+#ifndef _IPT_REALM_H
-+#define _IPT_REALM_H
-+
-+struct ipt_realm_info {
-+ u_int32_t id;
-+ u_int32_t mask;
-+ u_int8_t invert;
-+};
-+
-+#endif /* _IPT_REALM_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ROUTE.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_ROUTE.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_ROUTE.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_ROUTE.h 2004-08-19 21:32:38.942424600 +0200
@@ -0,0 +1,22 @@
+/* Header file for iptables ipt_ROUTE target
+ *
+#define IPT_ROUTE_CONTINUE 0x01
+
+#endif /*_IPT_ROUTE_H_target*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_sctp.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_sctp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_sctp.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_sctp.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_sctp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_sctp.h 2004-08-19 21:32:38.943424448 +0200
@@ -0,0 +1,107 @@
+#ifndef _IPT_SCTP_H_
+#define _IPT_SCTP_H_
+
+#endif /* _IPT_SCTP_H_ */
+
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_string.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_string.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_string.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_string.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_string.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_string.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_string.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_string.h 2004-08-19 21:32:38.945424144 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_STRING_H
+#define _IPT_STRING_H
+};
+
+#endif /* _IPT_STRING_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_time.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_time.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_time.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_time.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_time.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_time.h 2004-08-19 21:32:38.947423840 +0200
@@ -0,0 +1,15 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
+
+
+#endif /* __ipt_time_h_included__ */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_TTL.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_TTL.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_TTL.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_TTL.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_TTL.h 2004-08-19 21:32:38.949423536 +0200
@@ -0,0 +1,21 @@
+/* TTL modification module for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
+
+
+#endif
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_XOR.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv4/ipt_XOR.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_XOR.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_XOR.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_XOR.h 2004-08-19 21:32:38.950423384 +0200
@@ -0,0 +1,9 @@
+#ifndef _IPT_XOR_H
+#define _IPT_XOR_H
+};
+
+#endif /* _IPT_XOR_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_logging.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_logging.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_logging.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_logging.h 2004-07-14 12:43:01.246030336 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6_logging.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6_logging.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6_logging.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6_logging.h 2004-08-19 21:32:38.952423080 +0200
@@ -0,0 +1,5 @@
+/* IPv6 macros for the nternal logging interface. */
+#ifndef __IP6_LOGGING_H
+#define __IP6_LOGGING_H
+
+#endif /*__IP6_LOGGING_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_tables.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_tables.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-23 23:52:58.000000000 +0200
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6_tables.h 2004-07-14 12:45:13.405938976 +0200
-@@ -99,8 +99,6 @@
- u_int64_t pcnt, bcnt; /* Packet and byte counters */
- };
-
--static DECLARE_MUTEX(ip6t_mutex);
--
- /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
- #define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
- protocols */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2004-08-19 21:32:39.921275792 +0200
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
+};
+
+#endif /*_IP6T_FUZZY_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_HL.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_HL.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_HL.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_HL.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_HL.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_HL.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_HL.h 2004-08-19 21:32:39.922275640 +0200
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+
+
+#endif
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_nth.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_nth.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_nth.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_nth.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_nth.h 2004-08-19 21:32:39.924275336 +0200
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
+};
+
+#endif /*_IP6T_NTH_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_owner.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_owner.h 2003-12-15 19:46:58.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_owner.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_owner.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_owner.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_owner.h 2004-08-19 21:31:32.681497792 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_owner.h 2004-08-19 21:32:39.925275184 +0200
@@ -6,12 +6,14 @@
#define IP6T_OWNER_GID 0x02
#define IP6T_OWNER_PID 0x04
u_int8_t match, invert; /* flags */
};
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_policy.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_policy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_policy.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_policy.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_policy.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_policy.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_policy.h 2004-08-19 21:32:39.926275032 +0200
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
+};
+
+#endif /* _IP6T_POLICY_H */
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_REJECT.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-03-05 16:36:39.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_REJECT.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_REJECT.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-08-19 21:31:32.678498248 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_REJECT.h 2004-08-19 21:32:39.927274880 +0200
@@ -2,15 +2,17 @@
#define _IP6T_REJECT_H
-#endif /*_IPT_REJECT_H*/
+#endif /*_IP6T_REJECT_H*/
-diff -uNr linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h
---- linux-libc-headers-2.6.7.0.orig/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.7.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2004-07-14 11:50:58.000000000 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2004-08-19 21:32:39.928274728 +0200
@@ -0,0 +1,22 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
-diff -urN linux-libc-headers-2.6.7.0.org/include/linux/pkt_sched.h linux-libc-headers-2.6.7.0/include/linux/pkt_sched.h
---- linux-libc-headers-2.6.7.0.org/include/linux/pkt_sched.h 2004-08-04 19:36:56.953369088 +0200
-+++ linux-libc-headers-2.6.7.0/include/linux/pkt_sched.h 2004-08-04 19:45:15.968507256 +0200
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/pkt_sched.h linux-libc-headers-2.6.8.0/include/linux/pkt_sched.h
+--- linux-libc-headers-2.6.8.0.org/include/linux/pkt_sched.h 2004-08-19 21:26:04.663364128 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/pkt_sched.h 2004-08-19 21:28:02.623431472 +0200
@@ -2,7 +2,8 @@
#define __LINUX_PKT_SCHED_H
/* Logical priority bands not depending on specific packet scheduler.
Every scheduler will map them to real traffic classes, if it has
-@@ -432,6 +433,115 @@
-
- #define TCA_ATM_MAX TCA_ATM_STATE
-
+@@ -424,4 +425,114 @@
+ __u32 duplicate; /* random packet dup (0=none ~0=100%) */
+ __u32 jitter; /* random jitter in latency (us) */
+ };
++
+/* WRR section */
+
+// A sub weight and of a class
+ long changes[0];
+};
+
- /* Delay section */
- struct tc_dly_qopt
- {
+ #endif
+diff -urN linux-libc-headers-2.6.8.0.org/include/linux/pkt_sched.h.orig linux-libc-headers-2.6.8.0/include/linux/pkt_sched.h.orig
+--- linux-libc-headers-2.6.8.0.org/include/linux/pkt_sched.h.orig 2004-08-19 21:25:38.160393192 +0200
++++ linux-libc-headers-2.6.8.0/include/linux/pkt_sched.h.orig 1970-01-01 01:00:00.000000000 +0100
+@@ -1,417 +0,0 @@
+-#ifndef __LINUX_PKT_SCHED_H
+-#define __LINUX_PKT_SCHED_H
+-
+-#include <asm/types.h>
+-
+-
+-/* Logical priority bands not depending on specific packet scheduler.
+- Every scheduler will map them to real traffic classes, if it has
+- no more precise mechanism to classify packets.
+-
+- These numbers have no special meaning, though their coincidence
+- with obsolete IPv6 values is not occasional :-). New IPv6 drafts
+- preferred full anarchy inspired by diffserv group.
+-
+- Note: TC_PRIO_BESTEFFORT does not mean that it is the most unhappy
+- class, actually, as rule it will be handled with more care than
+- filler or even bulk.
+- */
+-
+-#define TC_PRIO_BESTEFFORT 0
+-#define TC_PRIO_FILLER 1
+-#define TC_PRIO_BULK 2
+-#define TC_PRIO_INTERACTIVE_BULK 4
+-#define TC_PRIO_INTERACTIVE 6
+-#define TC_PRIO_CONTROL 7
+-
+-#define TC_PRIO_MAX 15
+-
+-/* Generic queue statistics, available for all the elements.
+- Particular schedulers may have also their private records.
+- */
+-
+-struct tc_stats
+-{
+- __u64 bytes; /* NUmber of enqueues bytes */
+- __u32 packets; /* Number of enqueued packets */
+- __u32 drops; /* Packets dropped because of lack of resources */
+- __u32 overlimits; /* Number of throttle events when this
+- * flow goes out of allocated bandwidth */
+- __u32 bps; /* Current flow byte rate */
+- __u32 pps; /* Current flow packet rate */
+- __u32 qlen;
+- __u32 backlog;
+-};
+-
+-struct tc_estimator
+-{
+- signed char interval;
+- unsigned char ewma_log;
+-};
+-
+-/* "Handles"
+- ---------
+-
+- All the traffic control objects have 32bit identifiers, or "handles".
+-
+- They can be considered as opaque numbers from user API viewpoint,
+- but actually they always consist of two fields: major and
+- minor numbers, which are interpreted by kernel specially,
+- that may be used by applications, though not recommended.
+-
+- F.e. qdisc handles always have minor number equal to zero,
+- classes (or flows) have major equal to parent qdisc major, and
+- minor uniquely identifying class inside qdisc.
+-
+- Macros to manipulate handles:
+- */
+-
+-#define TC_H_MAJ_MASK (0xFFFF0000U)
+-#define TC_H_MIN_MASK (0x0000FFFFU)
+-#define TC_H_MAJ(h) ((h)&TC_H_MAJ_MASK)
+-#define TC_H_MIN(h) ((h)&TC_H_MIN_MASK)
+-#define TC_H_MAKE(maj,min) (((maj)&TC_H_MAJ_MASK)|((min)&TC_H_MIN_MASK))
+-
+-#define TC_H_UNSPEC (0U)
+-#define TC_H_ROOT (0xFFFFFFFFU)
+-#define TC_H_INGRESS (0xFFFFFFF1U)
+-
+-struct tc_ratespec
+-{
+- unsigned char cell_log;
+- unsigned char __reserved;
+- unsigned short feature;
+- short addend;
+- unsigned short mpu;
+- __u32 rate;
+-};
+-
+-/* FIFO section */
+-
+-struct tc_fifo_qopt
+-{
+- __u32 limit; /* Queue length: bytes for bfifo, packets for pfifo */
+-};
+-
+-/* PRIO section */
+-
+-#define TCQ_PRIO_BANDS 16
+-
+-struct tc_prio_qopt
+-{
+- int bands; /* Number of bands */
+- __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
+-};
+-
+-/* TBF section */
+-
+-struct tc_tbf_qopt
+-{
+- struct tc_ratespec rate;
+- struct tc_ratespec peakrate;
+- __u32 limit;
+- __u32 buffer;
+- __u32 mtu;
+-};
+-
+-enum
+-{
+- TCA_TBF_UNSPEC,
+- TCA_TBF_PARMS,
+- TCA_TBF_RTAB,
+- TCA_TBF_PTAB,
+-};
+-
+-
+-/* TEQL section */
+-
+-/* TEQL does not require any parameters */
+-
+-/* SFQ section */
+-
+-struct tc_sfq_qopt
+-{
+- unsigned quantum; /* Bytes per round allocated to flow */
+- int perturb_period; /* Period of hash perturbation */
+- __u32 limit; /* Maximal packets in queue */
+- unsigned divisor; /* Hash divisor */
+- unsigned flows; /* Maximal number of flows */
+-};
+-
+-/*
+- * NOTE: limit, divisor and flows are hardwired to code at the moment.
+- *
+- * limit=flows=128, divisor=1024;
+- *
+- * The only reason for this is efficiency, it is possible
+- * to change these parameters in compile time.
+- */
+-
+-/* RED section */
+-
+-enum
+-{
+- TCA_RED_UNSPEC,
+- TCA_RED_PARMS,
+- TCA_RED_STAB,
+-};
+-
+-struct tc_red_qopt
+-{
+- __u32 limit; /* HARD maximal queue length (bytes) */
+- __u32 qth_min; /* Min average length threshold (bytes) */
+- __u32 qth_max; /* Max average length threshold (bytes) */
+- unsigned char Wlog; /* log(W) */
+- unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */
+- unsigned char Scell_log; /* cell size for idle damping */
+- unsigned char flags;
+-#define TC_RED_ECN 1
+-};
+-
+-struct tc_red_xstats
+-{
+- __u32 early; /* Early drops */
+- __u32 pdrop; /* Drops due to queue limits */
+- __u32 other; /* Drops due to drop() calls */
+- __u32 marked; /* Marked packets */
+-};
+-
+-/* GRED section */
+-
+-#define MAX_DPs 16
+-
+-enum
+-{
+- TCA_GRED_UNSPEC,
+- TCA_GRED_PARMS,
+- TCA_GRED_STAB,
+- TCA_GRED_DPS,
+-};
+-
+-#define TCA_SET_OFF TCA_GRED_PARMS
+-struct tc_gred_qopt
+-{
+- __u32 limit; /* HARD maximal queue length (bytes)
+-*/
+- __u32 qth_min; /* Min average length threshold (bytes)
+-*/
+- __u32 qth_max; /* Max average length threshold (bytes)
+-*/
+- __u32 DP; /* upto 2^32 DPs */
+- __u32 backlog;
+- __u32 qave;
+- __u32 forced;
+- __u32 early;
+- __u32 other;
+- __u32 pdrop;
+-
+- unsigned char Wlog; /* log(W) */
+- unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */
+- unsigned char Scell_log; /* cell size for idle damping */
+- __u8 prio; /* prio of this VQ */
+- __u32 packets;
+- __u32 bytesin;
+-};
+-/* gred setup */
+-struct tc_gred_sopt
+-{
+- __u32 DPs;
+- __u32 def_DP;
+- __u8 grio;
+-};
+-
+-/* HTB section */
+-#define TC_HTB_NUMPRIO 8
+-#define TC_HTB_MAXDEPTH 8
+-#define TC_HTB_PROTOVER 3 /* the same as HTB and TC's major */
+-
+-struct tc_htb_opt
+-{
+- struct tc_ratespec rate;
+- struct tc_ratespec ceil;
+- __u32 buffer;
+- __u32 cbuffer;
+- __u32 quantum;
+- __u32 level; /* out only */
+- __u32 prio;
+-};
+-struct tc_htb_glob
+-{
+- __u32 version; /* to match HTB/TC */
+- __u32 rate2quantum; /* bps->quantum divisor */
+- __u32 defcls; /* default class number */
+- __u32 debug; /* debug flags */
+-
+- /* stats */
+- __u32 direct_pkts; /* count of non shapped packets */
+-};
+-enum
+-{
+- TCA_HTB_UNSPEC,
+- TCA_HTB_PARMS,
+- TCA_HTB_INIT,
+- TCA_HTB_CTAB,
+- TCA_HTB_RTAB,
+-};
+-struct tc_htb_xstats
+-{
+- __u32 lends;
+- __u32 borrows;
+- __u32 giants; /* too big packets (rate will not be accurate) */
+- __u32 tokens;
+- __u32 ctokens;
+-};
+-
+-/* HFSC section */
+-
+-struct tc_hfsc_qopt
+-{
+- __u16 defcls; /* default class */
+-};
+-
+-struct tc_service_curve
+-{
+- __u32 m1; /* slope of the first segment in bps */
+- __u32 d; /* x-projection of the first segment in us */
+- __u32 m2; /* slope of the second segment in bps */
+-};
+-
+-struct tc_hfsc_stats
+-{
+- __u64 work; /* total work done */
+- __u64 rtwork; /* work done by real-time criteria */
+- __u32 period; /* current period */
+- __u32 level; /* class level in hierarchy */
+-};
+-
+-enum
+-{
+- TCA_HFSC_UNSPEC,
+- TCA_HFSC_RSC,
+- TCA_HFSC_FSC,
+- TCA_HFSC_USC,
+- TCA_HFSC_MAX = TCA_HFSC_USC
+-};
+-
+-/* CBQ section */
+-
+-#define TC_CBQ_MAXPRIO 8
+-#define TC_CBQ_MAXLEVEL 8
+-#define TC_CBQ_DEF_EWMA 5
+-
+-struct tc_cbq_lssopt
+-{
+- unsigned char change;
+- unsigned char flags;
+-#define TCF_CBQ_LSS_BOUNDED 1
+-#define TCF_CBQ_LSS_ISOLATED 2
+- unsigned char ewma_log;
+- unsigned char level;
+-#define TCF_CBQ_LSS_FLAGS 1
+-#define TCF_CBQ_LSS_EWMA 2
+-#define TCF_CBQ_LSS_MAXIDLE 4
+-#define TCF_CBQ_LSS_MINIDLE 8
+-#define TCF_CBQ_LSS_OFFTIME 0x10
+-#define TCF_CBQ_LSS_AVPKT 0x20
+- __u32 maxidle;
+- __u32 minidle;
+- __u32 offtime;
+- __u32 avpkt;
+-};
+-
+-struct tc_cbq_wrropt
+-{
+- unsigned char flags;
+- unsigned char priority;
+- unsigned char cpriority;
+- unsigned char __reserved;
+- __u32 allot;
+- __u32 weight;
+-};
+-
+-struct tc_cbq_ovl
+-{
+- unsigned char strategy;
+-#define TC_CBQ_OVL_CLASSIC 0
+-#define TC_CBQ_OVL_DELAY 1
+-#define TC_CBQ_OVL_LOWPRIO 2
+-#define TC_CBQ_OVL_DROP 3
+-#define TC_CBQ_OVL_RCLASSIC 4
+- unsigned char priority2;
+- __u32 penalty;
+-};
+-
+-struct tc_cbq_police
+-{
+- unsigned char police;
+- unsigned char __res1;
+- unsigned short __res2;
+-};
+-
+-struct tc_cbq_fopt
+-{
+- __u32 split;
+- __u32 defmap;
+- __u32 defchange;
+-};
+-
+-struct tc_cbq_xstats
+-{
+- __u32 borrows;
+- __u32 overactions;
+- __s32 avgidle;
+- __s32 undertime;
+-};
+-
+-enum
+-{
+- TCA_CBQ_UNSPEC,
+- TCA_CBQ_LSSOPT,
+- TCA_CBQ_WRROPT,
+- TCA_CBQ_FOPT,
+- TCA_CBQ_OVL_STRATEGY,
+- TCA_CBQ_RATE,
+- TCA_CBQ_RTAB,
+- TCA_CBQ_POLICE,
+-};
+-
+-#define TCA_CBQ_MAX TCA_CBQ_POLICE
+-
+-/* dsmark section */
+-
+-enum {
+- TCA_DSMARK_UNSPEC,
+- TCA_DSMARK_INDICES,
+- TCA_DSMARK_DEFAULT_INDEX,
+- TCA_DSMARK_SET_TC_INDEX,
+- TCA_DSMARK_MASK,
+- TCA_DSMARK_VALUE
+-};
+-
+-#define TCA_DSMARK_MAX TCA_DSMARK_VALUE
+-
+-/* ATM section */
+-
+-enum {
+- TCA_ATM_UNSPEC,
+- TCA_ATM_FD, /* file/socket descriptor */
+- TCA_ATM_PTR, /* pointer to descriptor - later */
+- TCA_ATM_HDR, /* LL header */
+- TCA_ATM_EXCESS, /* excess traffic class (0 for CLP) */
+- TCA_ATM_ADDR, /* PVC address (for output only) */
+- TCA_ATM_STATE /* VC state (ATM_VS_*; for output only) */
+-};
+-
+-#define TCA_ATM_MAX TCA_ATM_STATE
+-
+-/* Network emulator */
+-struct tc_netem_qopt
+-{
+- __u32 latency; /* added delay (us) */
+- __u32 limit; /* fifo limit (packets) */
+- __u32 loss; /* random packet loss (0=none ~0=100%) */
+- __u32 gap; /* re-ordering gap (0 for delay all) */
+- __u32 duplicate; /* random packet dup (0=none ~0=100%) */
+- __u32 jitter; /* random jitter in latency (us) */
+-};
+-#endif
projects / packages / linux-libc-headers.git / commitdiff