[PATCH 2.6.11 2/4]: fix iptables userspace build

[PATCH 2.6.11 2/4]: fix iptables userspace build

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

Netfilter uses u_intXX_t types in it's headers shared with userspace. 
Some patch
added uXX types to a header, but iptables userspace doesn't know these 
types. This
breaks compilation with recent kernels. I know netfilter shouldn't use 
these types
in headers shared with userspace, but it currently does so in all files, 
so the
simple fix is to replace uXX by u_intXX_t.



[-- Attachment #2: 02.diff --]
[-- Type: text/x-patch, Size: 1007 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/02/01 14:16:17+01:00 pablo@eurodev.net 
#   [NETFILTER]: fix iptables userspace build
#   
#   Signed-off-by: Pablo Neira Ayuso <pablo@eurodev.net>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# include/linux/netfilter_ipv4/ip_conntrack_tuple.h
#   2005/02/01 14:16:09+01:00 pablo@eurodev.net +2 -2
#   [NETFILTER]: fix iptables userspace build
#   
#   Signed-off-by: Pablo Neira Ayuso <pablo@eurodev.net>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2005-02-03 20:43:01 +01:00
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2005-02-03 20:43:01 +01:00
@@ -64,10 +64,10 @@
 		} u;
 
 		/* The protocol. */
-		u8 protonum;
+		u_int8_t protonum;
 
 		/* The direction (for tuplehash) */
-		u8 dir;
+		u_int8_t dir;
 	} dst;
 };