Author: arekm Date: Tue Oct 3 07:10:38 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from git
---- Files affected:
SOURCES:
linux-libc-headers-partial-2.6.15.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/linux-libc-headers-partial-2.6.15.patch
diff -u SOURCES/linux-libc-headers-partial-2.6.15.patch:1.2
SOURCES/linux-libc-headers-partial-2.6.15.patch:1.3
--- SOURCES/linux-libc-headers-partial-2.6.15.patch:1.2 Sat Apr 22 23:40:20 2006
+++ SOURCES/linux-libc-headers-partial-2.6.15.patch Tue Oct 3 09:10:33 2006
@@ -1,6 +1,61 @@
+diff -urN linux-libc-headers-2.6.12.0.org/include/linux/genetlink.h
linux-libc-headers-2.6.12.0/include/linux/genetlink.h
+--- linux-libc-headers-2.6.12.0.org/include/linux/genetlink.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-libc-headers-2.6.12.0/include/linux/genetlink.h 2006-10-03
08:52:51.355389239 +0200
+@@ -0,0 +1,51 @@
++#ifndef __LINUX_GENERIC_NETLINK_H
++#define __LINUX_GENERIC_NETLINK_H
++
++#include <linux/netlink.h>
++
++#define GENL_NAMSIZ 16 /* length of family name */
++
++#define GENL_MIN_ID NLMSG_MIN_TYPE
++#define GENL_MAX_ID 1023
++
++struct genlmsghdr {
++ __u8 cmd;
++ __u8 version;
++ __u16 reserved;
++};
++
++#define GENL_HDRLEN NLMSG_ALIGN(sizeof(struct genlmsghdr))
++
++/*
++ * List of reserved static generic netlink identifiers:
++ */
++#define GENL_ID_GENERATE 0
++#define GENL_ID_CTRL NLMSG_MIN_TYPE
++
++/**************************************************************************
++ * Controller
++ **************************************************************************/
++
++enum {
++ CTRL_CMD_UNSPEC,
++ CTRL_CMD_NEWFAMILY,
++ CTRL_CMD_DELFAMILY,
++ CTRL_CMD_GETFAMILY,
++ CTRL_CMD_NEWOPS,
++ CTRL_CMD_DELOPS,
++ CTRL_CMD_GETOPS,
++ __CTRL_CMD_MAX,
++};
++
++#define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
++
++enum {
++ CTRL_ATTR_UNSPEC,
++ CTRL_ATTR_FAMILY_ID,
++ CTRL_ATTR_FAMILY_NAME,
++ __CTRL_ATTR_MAX,
++};
++
++#define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
++
++#endif /* __LINUX_GENERIC_NETLINK_H */
diff -urN linux-libc-headers-2.6.12.0.org/include/linux/inet_diag.h
linux-libc-headers-2.6.12.0/include/linux/inet_diag.h
--- linux-libc-headers-2.6.12.0.org/include/linux/inet_diag.h 1970-01-01
01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/inet_diag.h 2006-04-22
23:35:02.680745750 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/inet_diag.h 2006-10-03
08:52:01.470389911 +0200
@@ -0,0 +1,121 @@
+#ifndef _INET_DIAG_H_
+#define _INET_DIAG_H_ 1
@@ -124,8 +179,8 @@
+
+#endif /* _INET_DIAG_H_ */
diff -urN
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set.h
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set.h
---- linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set.h
2006-04-22 23:34:07.881321000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set.h
2006-04-22 23:35:02.680745750 +0200
+--- linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set.h
2006-10-03 08:51:33.426335000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set.h
2006-10-03 08:52:01.470389911 +0200
@@ -77,10 +77,12 @@
#define IPSET_MATCH_INV 0x04 /* Inverse matching */
@@ -188,8 +243,8 @@
/* Set this to THIS_MODULE if you are a module, otherwise NULL */
diff -urN
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_iphash.h
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_iphash.h
----
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_iphash.h
2006-04-22 23:34:07.889321000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_iphash.h
2006-04-22 23:35:02.680745750 +0200
+---
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_iphash.h
2006-10-03 08:51:33.426335000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_iphash.h
2006-10-03 08:52:01.470389911 +0200
@@ -8,12 +8,11 @@
struct ip_set_iphash {
@@ -205,8 +260,8 @@
struct ip_set_req_iphash_create {
diff -urN
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipmap.h
----
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
2006-04-22 23:34:07.889321000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipmap.h
2006-04-22 23:35:02.680745750 +0200
+---
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_ipmap.h
2006-10-03 08:51:33.426335000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipmap.h
2006-10-03 08:52:01.470389911 +0200
@@ -12,7 +12,7 @@
ip_set_ip_t last_ip; /* host byte order, included in range */
ip_set_ip_t netmask; /* subnet netmask */
@@ -218,7 +273,7 @@
struct ip_set_req_ipmap_create {
diff -urN
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipporthash.h
---
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h
1970-01-01 01:00:00.000000000 +0100
-+++
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipporthash.h
2006-04-22 23:35:02.680745750 +0200
++++
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_ipporthash.h
2006-10-03 08:52:01.470389911 +0200
@@ -0,0 +1,33 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
@@ -254,8 +309,8 @@
+
+#endif /* __IP_SET_IPPORTHASH_H */
diff -urN
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_nethash.h
linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_nethash.h
----
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_nethash.h
2006-04-22 23:34:07.897322000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_nethash.h
2006-04-22 23:35:02.680745750 +0200
+---
linux-libc-headers-2.6.12.0.org/include/linux/netfilter_ipv4/ip_set_nethash.h
2006-10-03 08:51:33.436340000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/netfilter_ipv4/ip_set_nethash.h
2006-10-03 08:52:01.470389911 +0200
@@ -8,12 +8,11 @@
struct ip_set_nethash {
@@ -271,8 +326,8 @@
struct ip_set_req_nethash_create {
diff -urN linux-libc-headers-2.6.12.0.org/include/linux/netlink.h
linux-libc-headers-2.6.12.0/include/linux/netlink.h
---- linux-libc-headers-2.6.12.0.org/include/linux/netlink.h 2006-04-22
23:34:08.049331000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/netlink.h 2006-04-22
23:35:02.680745750 +0200
+--- linux-libc-headers-2.6.12.0.org/include/linux/netlink.h 2006-10-03
08:51:33.446345000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/netlink.h 2006-10-03
08:58:28.904548350 +0200
@@ -8,18 +8,19 @@
#define NETLINK_SKIP 1 /* Reserved for ENskip
*/
#define NETLINK_USERSOCK 2 /* Reserved for user mode socket
protocols */
@@ -298,9 +353,18 @@
#define MAX_LINKS 32
+@@ -86,6 +87,8 @@
+ #define NLMSG_DONE 0x3 /* End of a dump */
+ #define NLMSG_OVERRUN 0x4 /* Data lost */
+
++#define NLMSG_MIN_TYPE 0x10 /* < 0x10: reserved control
messages */
++
+ struct nlmsgerr
+ {
+ int error;
diff -urN linux-libc-headers-2.6.12.0.org/include/linux/pkt_sched.h
linux-libc-headers-2.6.12.0/include/linux/pkt_sched.h
---- linux-libc-headers-2.6.12.0.org/include/linux/pkt_sched.h 2006-04-22
23:34:07.765313000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/pkt_sched.h 2006-04-22
23:35:02.684746000 +0200
+--- linux-libc-headers-2.6.12.0.org/include/linux/pkt_sched.h 2006-10-03
08:51:33.406325000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/pkt_sched.h 2006-10-03
08:52:01.480394925 +0200
@@ -459,6 +459,7 @@
TCA_NETEM_CORR,
TCA_NETEM_DELAY_DIST,
@@ -324,7 +388,7 @@
/* WRR section */
diff -urN linux-libc-headers-2.6.12.0.org/include/linux/rtnetlink.h
linux-libc-headers-2.6.12.0/include/linux/rtnetlink.h
--- linux-libc-headers-2.6.12.0.org/include/linux/rtnetlink.h 2005-07-06
02:17:21.000000000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/rtnetlink.h 2006-04-22
23:38:40.122335000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/rtnetlink.h 2006-10-03
08:55:33.736764910 +0200
@@ -89,6 +89,13 @@
RTM_GETANYCAST = 62,
#define RTM_GETANYCAST RTM_GETANYCAST
@@ -348,7 +412,15 @@
/* rtm_scope
-@@ -492,6 +501,106 @@
+@@ -254,6 +263,7 @@
+ RTA_CACHEINFO,
+ RTA_SESSION,
+ RTA_MP_ALGO,
++ RTA_TABLE,
+ __RTA_MAX
+ };
+
+@@ -492,6 +502,106 @@
__u32 ndm_refcnt;
};
@@ -457,7 +529,7 @@
****/
diff -urN linux-libc-headers-2.6.12.0.org/include/linux/xfrm.h
linux-libc-headers-2.6.12.0/include/linux/xfrm.h
--- linux-libc-headers-2.6.12.0.org/include/linux/xfrm.h 2005-07-06
02:17:21.000000000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/xfrm.h 2006-04-22
23:35:02.684746000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/xfrm.h 2006-10-03
08:52:01.480394925 +0200
@@ -174,6 +174,8 @@
XFRMA_ALG_COMP, /* struct xfrm_algo */
XFRMA_ENCAP, /* struct xfrm_algo + struct xfrm_encap_tmpl */
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-libc-headers-partial-2.6.15.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
