- bugfixes in ip.h and tcp.h

Changed files:
    linux-libc-headers-endian.patch -> 1.2

diff --git a/linux-libc-headers-endian.patch b/linux-libc-headers-endian.patch
index c34afd25b6cbb5611c07675b5210e38ee17c77aa..e6f195ce1cd6b49369a1e0b56f150d860b647410 100644 (file)
--- a/linux-libc-headers-endian.patch
+++ b/linux-libc-headers-endian.patch
@@ -1,6 +1,6 @@
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h
 --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h    2005-03-13 21:54:07.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 21:24:27.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/asm-m32r/elf.h 2005-08-23 22:19:47.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <asm/ptrace.h>
  #include <asm/user.h>
@@ -23,7 +23,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/elf.h linux-libc-hea
  #error no endian defined
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h
 --- linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h   2005-03-25 20:39:05.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h        2005-08-23 21:26:07.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/asm-m32r/stat.h        2005-08-23 22:19:47.000000000 +0200
 @@ -5,7 +5,7 @@
  
  /* orig : i386 2.4.18 */
@@ -48,7 +48,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-m32r/stat.h linux-libc-he
  #else
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h
 --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h        2004-10-31 20:54:13.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h     2005-08-23 21:27:06.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/jmr3927.h     2005-08-23 22:19:47.000000000 +0200
 @@ -16,6 +16,7 @@
  #ifndef __ASSEMBLY__
  #include <asm/system.h>
@@ -72,7 +72,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/jmr3927.h li
  #else
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h
 --- linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h 2004-10-31 20:54:13.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h      2005-08-23 21:27:45.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/asm-mips/jmr3927/tx3927.h      2005-08-23 22:19:47.000000000 +0200
 @@ -67,9 +67,9 @@
        volatile unsigned long csr;
  };
@@ -87,7 +87,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/asm-mips/jmr3927/tx3927.h lin
  #define endian_def_sb2(e1,e2,e3)      \
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-headers-2.6.12.0/include/linux/aio_abi.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h   2005-07-06 02:17:21.000000000 +0200
-+++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h        2005-08-23 21:45:22.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/aio_abi.h        2005-08-23 22:19:47.000000000 +0200
 @@ -53,9 +53,9 @@
        __s64           res2;           /* secondary result */
  };
@@ -102,7 +102,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/aio_abi.h linux-libc-he
  #error edit for your odd byteorder.
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-headers-2.6.12.0/include/linux/cdrom.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h     2005-01-08 15:03:51.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h  2005-08-23 21:44:23.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/cdrom.h  2005-08-23 22:19:47.000000000 +0200
 @@ -15,7 +15,7 @@
  #include <endian.h>
  #include <byteswap.h>
@@ -244,7 +244,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/cdrom.h linux-libc-head
          __u8 damage                   : 1;
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-headers-2.6.12.0/include/linux/icmpv6.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h    2005-03-26 19:58:03.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 21:45:49.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/icmpv6.h 2005-08-23 22:19:47.000000000 +0200
 @@ -24,13 +24,13 @@
                } u_echo;
  
@@ -278,7 +278,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/icmpv6.h linux-libc-hea
                                        reserved:6;
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-headers-2.6.12.0/include/linux/ide.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/ide.h       2005-03-13 21:54:02.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/ide.h    2005-08-23 21:45:12.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/ide.h    2005-08-23 22:19:47.000000000 +0200
 @@ -221,14 +221,14 @@
  typedef union {
        unsigned all                    : 8;
@@ -442,7 +442,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ide.h linux-libc-header
                unsigned one5           :1;
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-headers-2.6.12.0/include/linux/if_hippi.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h  2004-10-31 20:55:19.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h       2005-08-23 21:46:49.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/if_hippi.h       2005-08-23 22:19:47.000000000 +0200
 @@ -82,7 +82,7 @@
  {
  #if 0
@@ -488,7 +488,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_hippi.h linux-libc-h
  #endif
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-headers-2.6.12.0/include/linux/if_pppox.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h  2005-03-13 21:54:01.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h       2005-08-23 21:47:05.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/if_pppox.h       2005-08-23 22:19:47.000000000 +0200
 @@ -91,10 +91,10 @@
  #define PTT_GEN_ERR   __constant_htons(0x0203)
  
@@ -504,7 +504,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/if_pppox.h linux-libc-h
  #else
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-headers-2.6.12.0/include/linux/igmp.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h      2005-03-26 19:58:04.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/igmp.h   2005-08-23 21:47:22.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/igmp.h   2005-08-23 22:19:47.000000000 +0200
 @@ -67,11 +67,11 @@
        __u8 code;
        __u16 csum;
@@ -521,7 +521,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/igmp.h linux-libc-heade
             qrv:3;
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers-2.6.12.0/include/linux/ip.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/ip.h        2004-10-31 20:55:50.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/ip.h     2005-08-23 21:47:40.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/ip.h     2005-08-23 22:21:06.000000000 +0200
 @@ -83,10 +83,10 @@
  #ifndef __NETINET_IP_H
  
@@ -531,13 +531,13 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ip.h linux-libc-headers
        __u8    ihl:4,
                version:4;
 -#elif defined (__BIG_ENDIAN)
-+#if __BYTE_ORDER == __BIG_ENDIAN
++#elif __BYTE_ORDER == __BIG_ENDIAN
        __u8    version:4,
                ihl:4;
  #else
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-headers-2.6.12.0/include/linux/ipv6.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h      2004-10-31 20:56:07.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h   2005-08-23 21:43:11.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/ipv6.h   2005-08-23 22:19:47.000000000 +0200
 @@ -102,10 +102,10 @@
   */
  
@@ -553,7 +553,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/ipv6.h linux-libc-heade
  #else
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-headers-2.6.12.0/include/linux/mtd/map.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h   2005-03-25 20:34:24.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h        2005-08-23 21:31:21.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/mtd/map.h        2005-08-23 22:19:47.000000000 +0200
 @@ -7,6 +7,7 @@
  #include <linux/types.h>
  #include <asm/system.h>
@@ -573,7 +573,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/mtd/map.h linux-libc-he
                        bitpos = (map_bankwidth(map)-1-i)*8;
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h 2005-03-26 19:58:00.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h      2005-08-23 21:32:36.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/linux/raid/md_p.h      2005-08-23 22:19:47.000000000 +0200
 @@ -16,6 +16,7 @@
  #define _MD_P_H
  
@@ -593,16 +593,16 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/raid/md_p.h linux-libc-
        __u32 cp_events_hi;     /*  9 high-order of checkpoint update count   */
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-headers-2.6.12.0/include/linux/tcp.h
 --- linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h       2005-01-08 15:03:40.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/linux/tcp.h    2005-08-23 21:48:11.000000000 +0200
-@@ -18,14 +18,14 @@
++++ linux-libc-headers-2.6.12.0/include/linux/tcp.h    2005-08-23 22:22:11.000000000 +0200
+@@ -18,6 +18,7 @@
  #define _LINUX_TCP_H
  
  #include <linux/types.h>
--#include <asm/byteorder.h>
 +#include <endian.h>
+ #include <asm/byteorder.h>
  
  struct tcphdr {
-       __u16   source;
+@@ -25,7 +26,7 @@
        __u16   dest;
        __u32   seq;
        __u32   ack_seq;
@@ -611,7 +611,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-header
        __u16   res1:4,
                doff:4,
                fin:1,
-@@ -36,7 +36,7 @@
+@@ -36,7 +37,7 @@
                urg:1,
                ece:1,
                cwr:1;
@@ -622,7 +622,7 @@ diff -Nur linux-libc-headers-2.6.12.0.orig/include/linux/tcp.h linux-libc-header
                cwr:1,
 diff -Nur linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h
 --- linux-libc-headers-2.6.12.0.orig/include/sound/cs46xx_dsp_scb_types.h      2005-03-25 20:30:35.000000000 +0100
-+++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h   2005-08-23 21:49:22.000000000 +0200
++++ linux-libc-headers-2.6.12.0/include/sound/cs46xx_dsp_scb_types.h   2005-08-23 22:19:47.000000000 +0200
 @@ -27,12 +27,12 @@
  #ifndef __CS46XX_DSP_SCB_TYPES_H__
  #define __CS46XX_DSP_SCB_TYPES_H__