On Sunday 2008-04-13 11:35, Patrick McHardy wrote:
>> > > Allow iptables to compile without a kernel source tree. This
>> > > implies fixing build for older kernels, such as 2.6.17 which
>> > > lack xt_SECMARK.h.
>> > >
>> > Which version are these headers based on?
>>
>> There is just one version. The file never changed since it
>> was initially added as v2.6.17-69-g5e6874c.
>
> The question referred to all those headers.
>
They are from kaber/nf-2.6.26.git (46ae7629).
Except netfilter.h, which is from 7b33ed22^.
If you fold in the hunks below, it too will be up to 46ae7629. Thanks.
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 6922c7f..4196a51 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -1,7 +1,6 @@
#ifndef __LINUX_NETFILTER_H
#define __LINUX_NETFILTER_H
-//#include <linux/compiler.h>
/* Responses from hook functions. */
#define NF_DROP 0
@@ -20,7 +19,7 @@
#define NF_VERDICT_QMASK 0xffff0000
#define NF_VERDICT_QBITS 16
-#define NF_QUEUE_NR(x) (((x << NF_VERDICT_QBITS) & NF_VERDICT_QMASK) | NF_QUEUE)
+#define NF_QUEUE_NR(x) ((((x) << NF_VERDICT_BITS) & NF_VERDICT_QMASK) | NF_QUEUE)
/* only for userspace compatibility */
/* Generic cache responses from hook functions.
@@ -38,7 +37,7 @@ enum nf_inet_hooks {
};
union nf_inet_addr {
- u_int32_t all[4];
+ __u32 all[4];
__be32 ip;
__be32 ip6[4];
struct in_addr in;
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
