- killed junk

Changed files:
    linux-libc-headers-partial-2.6.14.patch -> 1.3

diff --git a/linux-libc-headers-partial-2.6.14.patch b/linux-libc-headers-partial-2.6.14.patch
index d23b3f27ac38634f91f68a3cd4bed51077cc7b20..6267e8f6b446a33dabd85250bc4c008221418709 100644 (file)
--- a/linux-libc-headers-partial-2.6.14.patch
+++ b/linux-libc-headers-partial-2.6.14.patch
@@ -151,113 +151,6 @@ diff -urN linux-libc-headers-2.6.12.0.org/include/linux/netlink.h linux-libc-hea
  
  #define MAX_LINKS 32          
  
-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~   1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/netlink.h~       2005-11-10 15:36:06.063369250 +0100
-@@ -0,0 +1,103 @@
-+#ifndef __LINUX_NETLINK_H
-+#define __LINUX_NETLINK_H
-+
-+#include <sys/socket.h> /* for sa_family_t */
-+#include <linux/types.h>
-+
-+#define NETLINK_ROUTE         0       /* Routing/device hook                          */
-+#define NETLINK_SKIP          1       /* Reserved for ENskip                          */
-+#define NETLINK_USERSOCK      2       /* Reserved for user mode socket protocols      */
-+#define NETLINK_FIREWALL      3       /* Firewalling hook                             */
-+#define NETLINK_INET_DIAG     4       /* INET socket monitoring                       */
-+#define NETLINK_NFLOG         5       /* netfilter/iptables ULOG */
-+#define NETLINK_XFRM          6       /* ipsec */
-+#define NETLINK_SELINUX               7       /* SELinux event notifications */
-+#define NETLINK_ISCSI         8       /* Open-ISCSI */
-+#define NETLINK_AUDIT         9       /* auditing */
-+#define NETLINK_FIB_LOOKUP    10
-+#define NETLINK_CONNECTOR     11
-+#define NETLINK_NETFILTER     12      /* netfilter subsystem */
-+#define NETLINK_IP6_FW                13
-+#define NETLINK_DNRTMSG               14      /* DECnet routing messages */
-+#define NETLINK_KOBJECT_UEVENT        15      /* Kernel messages to userspace */
-+#define NETLINK_GENERIC               16
-+
-+#define MAX_LINKS 32          
-+
-+struct sockaddr_nl
-+{
-+      sa_family_t     nl_family;      /* AF_NETLINK   */
-+      unsigned short  nl_pad;         /* zero         */
-+      __u32           nl_pid;         /* process pid  */
-+              __u32           nl_groups;      /* multicast groups mask */
-+};
-+
-+struct nlmsghdr
-+{
-+      __u32           nlmsg_len;      /* Length of message including header */
-+      __u16           nlmsg_type;     /* Message content */
-+      __u16           nlmsg_flags;    /* Additional flags */
-+      __u32           nlmsg_seq;      /* Sequence number */
-+      __u32           nlmsg_pid;      /* Sending process PID */
-+};
-+
-+/* Flags values */
-+
-+#define NLM_F_REQUEST         1       /* It is request message.       */
-+#define NLM_F_MULTI           2       /* Multipart message, terminated by NLMSG_DONE */
-+#define NLM_F_ACK             4       /* Reply with ack, with zero or error code */
-+#define NLM_F_ECHO            8       /* Echo this request            */
-+
-+/* Modifiers to GET request */
-+#define NLM_F_ROOT    0x100   /* specify tree root    */
-+#define NLM_F_MATCH   0x200   /* return all matching  */
-+#define NLM_F_ATOMIC  0x400   /* atomic GET           */
-+#define NLM_F_DUMP    (NLM_F_ROOT|NLM_F_MATCH)
-+
-+/* Modifiers to NEW request */
-+#define NLM_F_REPLACE 0x100   /* Override existing            */
-+#define NLM_F_EXCL    0x200   /* Do not touch, if it exists   */
-+#define NLM_F_CREATE  0x400   /* Create, if it does not exist */
-+#define NLM_F_APPEND  0x800   /* Add to end of list           */
-+
-+
-+/*
-+   4.4BSD ADD         NLM_F_CREATE|NLM_F_EXCL
-+   4.4BSD CHANGE      NLM_F_REPLACE
-+
-+   True CHANGE                NLM_F_CREATE|NLM_F_REPLACE
-+   Append             NLM_F_CREATE
-+   Check              NLM_F_EXCL
-+ */
-+
-+#define NLMSG_ALIGNTO 4
-+#define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) )
-+#define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(sizeof(struct nlmsghdr)))
-+#define NLMSG_SPACE(len) NLMSG_ALIGN(NLMSG_LENGTH(len))
-+#define NLMSG_DATA(nlh)  ((void*)(((char*)nlh) + NLMSG_LENGTH(0)))
-+#define NLMSG_NEXT(nlh,len)    ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
-+                                (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-+#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \
-+                         (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \
-+                         (nlh)->nlmsg_len <= (len))
-+#define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len)))
-+
-+#define NLMSG_NOOP            0x1     /* Nothing.             */
-+#define NLMSG_ERROR           0x2     /* Error                */
-+#define NLMSG_DONE            0x3     /* End of a dump        */
-+#define NLMSG_OVERRUN         0x4     /* Data lost            */
-+
-+struct nlmsgerr
-+{
-+      int             error;
-+      struct nlmsghdr msg;
-+};
-+
-+#define NET_MAJOR 36          /* Major 36 is reserved for networking */
-+
-+enum {
-+      NETLINK_UNCONNECTED = 0,
-+      NETLINK_CONNECTED
-+};
-+
-+#endif        /* __LINUX_NETLINK_H */
 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   2005-11-10 15:30:37.046807000 +0100