]> git.pld-linux.org Git - packages/linux-libc-headers.git/commitdiff
projects / packages / linux-libc-headers.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1b1d28)
- updated for 2.6.9.1
authorJakub Bogusz <qboosh@pld-linux.org>
Sun, 7 Nov 2004 21:30:19 +0000 (21:30 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    linux-libc-headers-netfilter.patch -> 1.20
    linux-libc-headers-wrr.patch -> 1.5

linux-libc-headers-netfilter.patch patch | blob | blame | history
linux-libc-headers-wrr.patch patch | blob | blame | history

diff --git a/linux-libc-headers-netfilter.patch b/linux-libc-headers-netfilter.patch
index aaf8d0ca1bea41f9fdd1a4ead2f87bb3fe1cb321..1f12e794e6540b334d94c06b7c5b868f5ff5b389 100644 (file)
--- a/linux-libc-headers-netfilter.patch
+++ b/linux-libc-headers-netfilter.patch
@@ -1,71 +1,3 @@
-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>
- #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_sctp.h>
- 
- /* per conntrack: protocol private data */
- union ip_conntrack_proto {
-       /* insert conntrack proto private data here */
-+      struct ip_ct_sctp sctp;
-       struct ip_ct_tcp tcp;
-       struct ip_ct_icmp icmp;
- };
-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
-+/* SCTP tracking. */
-+
-+enum sctp_conntrack {
-+      SCTP_CONNTRACK_NONE,
-+      SCTP_CONNTRACK_CLOSED,
-+      SCTP_CONNTRACK_COOKIE_WAIT,
-+      SCTP_CONNTRACK_COOKIE_ECHOED,
-+      SCTP_CONNTRACK_ESTABLISHED,
-+      SCTP_CONNTRACK_SHUTDOWN_SENT,
-+      SCTP_CONNTRACK_SHUTDOWN_RECD,
-+      SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
-+      SCTP_CONNTRACK_MAX
-+};
-+
-+struct ip_ct_sctp
-+{
-+      enum sctp_conntrack state;
-+
-+      u_int32_t vtag[IP_CT_DIR_MAX];
-+      u_int32_t ttag[IP_CT_DIR_MAX];
-+};
-+
-+#endif /* _IP_CONNTRACK_SCTP_H */
-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;
-       } icmp;
-+      struct {
-+              u_int16_t port;
-+      } sctp;
- };
- 
- /* The manipulable part of the tuple. */
-@@ -55,6 +58,9 @@
-                       struct {
-                               u_int8_t type, code;
-                       } icmp;
-+                      struct {
-+                              u_int16_t port;
-+                      } sctp;
-               } u;
- 
-               /* The protocol. */
 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
@@ -553,117 +485,6 @@ diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_ROUTE.
 +#define IPT_ROUTE_CONTINUE        0x01
 +
 +#endif /*_IPT_ROUTE_H_target*/
-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_
-+
-+#define IPT_SCTP_SRC_PORTS            0x01
-+#define IPT_SCTP_DEST_PORTS           0x02
-+#define IPT_SCTP_CHUNK_TYPES          0x04
-+
-+#define IPT_SCTP_VALID_FLAGS          0x07
-+
-+#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
-+
-+
-+struct ipt_sctp_flag_info {
-+      u_int8_t chunktype;
-+      u_int8_t flag;
-+      u_int8_t flag_mask;
-+};
-+
-+#define IPT_NUM_SCTP_FLAGS    4
-+
-+struct ipt_sctp_info {
-+      u_int16_t dpts[2];  /* Min, Max */
-+      u_int16_t spts[2];  /* Min, Max */
-+
-+      u_int32_t chunkmap[256 / sizeof (u_int32_t)];  /* Bit mask of chunks to be matched according to RFC 2960 */
-+
-+#define SCTP_CHUNK_MATCH_ANY   0x01  /* Match if any of the chunk types are present */
-+#define SCTP_CHUNK_MATCH_ALL   0x02  /* Match if all of the chunk types are present */
-+#define SCTP_CHUNK_MATCH_ONLY  0x04  /* Match if these are the only chunk types present */
-+
-+      u_int32_t chunk_match_type;
-+      struct ipt_sctp_flag_info flag_info[IPT_NUM_SCTP_FLAGS];
-+      int flag_count;
-+
-+      u_int32_t flags;
-+      u_int32_t invflags;
-+};
-+
-+#define bytes(type) (sizeof(type) * 8)
-+
-+#define SCTP_CHUNKMAP_SET(chunkmap, type)             \
-+      do {                                            \
-+              chunkmap[type / bytes(u_int32_t)] |=    \
-+                      1 << (type % bytes(u_int32_t)); \
-+      } while (0)
-+
-+#define SCTP_CHUNKMAP_CLEAR(chunkmap, type)                   \
-+      do {                                                    \
-+              chunkmap[type / bytes(u_int32_t)] &=            \
-+                      ~(1 << (type % bytes(u_int32_t)));      \
-+      } while (0)
-+
-+#define SCTP_CHUNKMAP_IS_SET(chunkmap, type)                  \
-+({                                                            \
-+      (chunkmap[type / bytes (u_int32_t)] &                   \
-+              (1 << (type % bytes (u_int32_t)))) ? 1: 0;      \
-+})
-+
-+#define SCTP_CHUNKMAP_RESET(chunkmap)                                 \
-+      do {                                                    \
-+              int i;                                          \
-+              for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
-+                      chunkmap[i] = 0;                        \
-+      } while (0)
-+
-+#define SCTP_CHUNKMAP_SET_ALL(chunkmap)                       \
-+      do {                                                    \
-+              int i;                                          \
-+              for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
-+                      chunkmap[i] = ~0;                       \
-+      } while (0)
-+
-+#define SCTP_CHUNKMAP_COPY(destmap, srcmap)                   \
-+      do {                                                    \
-+              int i;                                          \
-+              for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
-+                      destmap[i] = srcmap[i];                 \
-+      } while (0)
-+
-+#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap)              \
-+({                                                    \
-+      int i;                                          \
-+      int flag = 1;                                   \
-+      for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
-+              if (chunkmap[i]) {                      \
-+                      flag = 0;                       \
-+                      break;                          \
-+              }                                       \
-+      }                                               \
-+        flag;                                         \
-+})
-+
-+#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap)            \
-+({                                                    \
-+      int i;                                          \
-+      int flag = 1;                                   \
-+      for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
-+              if (chunkmap[i] != ~0) {                \
-+                      flag = 0;                       \
-+                              break;                  \
-+              }                                       \
-+      }                                               \
-+        flag;                                         \
-+})
-+
-+#endif /* _IPT_SCTP_H_ */
-+
 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
@@ -903,33 +724,6 @@ diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv6/ip6t_polic
 +};
 +
 +#endif /* _IP6T_POLICY_H */
-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
- 
- enum ip6t_reject_with {
--      IP6T_ICMP_NET_UNREACHABLE,
--      IP6T_ICMP_HOST_UNREACHABLE,
--      IP6T_ICMP_PROT_UNREACHABLE,
--      IP6T_ICMP_PORT_UNREACHABLE,
--      IP6T_ICMP_ECHOREPLY
-+      IP6T_ICMP6_NO_ROUTE,
-+      IP6T_ICMP6_ADM_PROHIBITED,
-+      IP6T_ICMP6_NOT_NEIGHBOUR,
-+      IP6T_ICMP6_ADDR_UNREACH,
-+      IP6T_ICMP6_PORT_UNREACH,
-+      IP6T_ICMP6_ECHOREPLY,
-+      IP6T_TCP_RESET
- };
- 
- struct ip6t_reject_info {
-       enum ip6t_reject_with with;      /* reject type */
- };
- 
--#endif /*_IPT_REJECT_H*/
-+#endif /*_IP6T_REJECT_H*/
 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
diff --git a/linux-libc-headers-wrr.patch b/linux-libc-headers-wrr.patch
index 7a5fbe1f26e2ef01fd1be170ff5fb4e37d09ced3..8f1bd6e543416adc99f2149132c635f8ea5a577c 100644 (file)
--- a/linux-libc-headers-wrr.patch
+++ b/linux-libc-headers-wrr.patch
@@ -1,6 +1,5 @@
-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
+--- linux-libc-headers-2.6.9.1/include/linux/pkt_sched.h.orig  2004-11-07 21:03:14.924678496 +0100
++++ linux-libc-headers-2.6.9.1/include/linux/pkt_sched.h       2004-11-07 21:04:53.666667432 +0100
 @@ -2,7 +2,8 @@
  #define __LINUX_PKT_SCHED_H
  
@@ -11,11 +10,10 @@ diff -urN linux-libc-headers-2.6.8.0.org/include/linux/pkt_sched.h linux-libc-he
  
  /* Logical priority bands not depending on specific packet scheduler.
     Every scheduler will map them to real traffic classes, if it has
-@@ -424,4 +425,114 @@
-       __u32   duplicate;      /* random packet dup  (0=none ~0=100%) */
-       __u32   jitter;         /* random jitter in latency (us) */
- };
-+
+@@ -444,4 +445,113 @@
+ 
+ #define NETEM_DIST_SCALE      8192
+ 
 +/* WRR section */
 +
 +// A sub weight and of a class
Linux kernel headers for use with C libraries
This page took 0.051549 seconds and 4 git commands to generate.