diff options
Diffstat (limited to 'packages/linux-libc-headers')
| -rw-r--r-- | packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch | 31 | ||||
| -rw-r--r-- | packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch b/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch new file mode 100644 index 0000000000..f7f77af0de --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch @@ -0,0 +1,31 @@ +iptables 1.3.3 assumes that ipt_scpt.h defines ELEMCOUNT, but ipt_scpt.h +moved to ARRAY_SIZE (which would be defined in linux/kernel.h). +The ip_conntrack_dir definition now resides in linux/netfilter/ip_conntrack_common.h + +--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h.orig 2006-03-20 22:03:04.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h 2006-03-20 22:07:09.000000000 +0100 +@@ -7,6 +7,8 @@ + + #define IPT_SCTP_VALID_FLAGS 0x07 + ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ++#define ELEMCOUNT(x) (sizeof(x) / sizeof((x)[0])) + + struct ipt_sctp_flag_info { + u_int8_t chunktype; +--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h.orig 2006-03-20 21:51:10.000000000 +0100 ++++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2006-03-20 21:51:12.000000000 +0100 +@@ -89,13 +89,6 @@ + (tuple)->dst.u.all = 0; \ + } while (0) + +-enum ip_conntrack_dir +-{ +- IP_CT_DIR_ORIGINAL, +- IP_CT_DIR_REPLY, +- IP_CT_DIR_MAX +-}; +- + static inline int ip_ct_tuple_src_equal(const struct ip_conntrack_tuple *t1, + const struct ip_conntrack_tuple *t2) + { diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb index e8b6e6bb13..9012e0f454 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb @@ -14,11 +14,12 @@ DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use." LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" INHIBIT_DEFAULT_DEPS = "1" -PR = "r2" +PR = "r3" SRC_URI = "http://ewi546.ewi.utwente.nl/OE/eabi/linux-libc-headers-${PV}.tar.bz2 \ file://keyboard.patch;patch=1 \ file://asm-arch-irqs.patch;patch=1 \ + file://linux-netfilter_ipv4.patch;patch=1 \ file://linux-rtc.patch;patch=1 \ file://linux-videodev2.patch;patch=1" |