headers, netfilter: Use kernel type names __u8, __u16, __u32

These types are guaranteed to be defined by <linux/types.h> for
both userland and kernel, unlike u_intN_t.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index adbf4bf..e08565d 100644 (file)
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -52,7 +52,7 @@ struct arpt_arp {
        struct in_addr smsk, tmsk;
 
        /* Device hw address length, src+target device addresses */
        struct in_addr smsk, tmsk;
 
        /* Device hw address length, src+target device addresses */

-       u_int8_t arhln, arhln_mask;
+       __u8 arhln, arhln_mask;

        struct arpt_devaddr_info src_devaddr;
        struct arpt_devaddr_info tgt_devaddr;
 
        struct arpt_devaddr_info src_devaddr;
        struct arpt_devaddr_info tgt_devaddr;
 


@@ -71,9 +71,9 @@ struct arpt_arp {
        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
 
        /* Flags word */
        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
 
        /* Flags word */

-       u_int8_t flags;
+       __u8 flags;

        /* Inverse flags */
        /* Inverse flags */

-       u_int16_t invflags;
+       __u16 invflags;

 };
 
 /* Values for "flag" field in struct arpt_ip (general arp structure).
 };
 
 /* Values for "flag" field in struct arpt_ip (general arp structure).


@@ -102,9 +102,9 @@ struct arpt_entry
        struct arpt_arp arp;
 
        /* Size of arpt_entry + matches */
        struct arpt_arp arp;
 
        /* Size of arpt_entry + matches */

-       u_int16_t target_offset;
+       __u16 target_offset;

        /* Size of arpt_entry + matches + target */
        /* Size of arpt_entry + matches + target */

-       u_int16_t next_offset;
+       __u16 next_offset;

 
        /* Back pointer */
        unsigned int comefrom;
 
        /* Back pointer */
        unsigned int comefrom;


@@ -260,8 +260,8 @@ extern unsigned int arpt_do_table(struct sk_buff *skb,
 
 struct compat_arpt_entry {
        struct arpt_arp arp;
 
 struct compat_arpt_entry {
        struct arpt_arp arp;

-       u_int16_t target_offset;
-       u_int16_t next_offset;
+       __u16 target_offset;
+       __u16 next_offset;

        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];
        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 64a5d95..db79231 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -81,12 +81,12 @@ struct ipt_ip {
        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
 
        /* Protocol, 0 = ANY */
        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
 
        /* Protocol, 0 = ANY */

-       u_int16_t proto;
+       __u16 proto;

 
        /* Flags word */
 
        /* Flags word */

-       u_int8_t flags;
+       __u8 flags;

        /* Inverse flags */
        /* Inverse flags */

-       u_int8_t invflags;
+       __u8 invflags;

 };
 
 /* Values for "flag" field in struct ipt_ip (general ip structure). */
 };
 
 /* Values for "flag" field in struct ipt_ip (general ip structure). */


@@ -114,9 +114,9 @@ struct ipt_entry {
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */

-       u_int16_t target_offset;
+       __u16 target_offset;

        /* Size of ipt_entry + matches + target */
        /* Size of ipt_entry + matches + target */

-       u_int16_t next_offset;
+       __u16 next_offset;

 
        /* Back pointer */
        unsigned int comefrom;
 
        /* Back pointer */
        unsigned int comefrom;


@@ -149,9 +149,9 @@ struct ipt_entry {
 
 /* ICMP matching stuff */
 struct ipt_icmp {
 
 /* ICMP matching stuff */
 struct ipt_icmp {

-       u_int8_t type;                          /* type to match */
-       u_int8_t code[2];                       /* range of code */
-       u_int8_t invflags;                      /* Inverse flags */
+       __u8 type;                              /* type to match */
+       __u8 code[2];                           /* range of code */
+       __u8 invflags;                          /* Inverse flags */

 };
 
 /* Values for "inv" field for struct ipt_icmp. */
 };
 
 /* Values for "inv" field for struct ipt_icmp. */


@@ -288,8 +288,8 @@ extern unsigned int ipt_do_table(struct sk_buff *skb,
 struct compat_ipt_entry {
        struct ipt_ip ip;
        compat_uint_t nfcache;
 struct compat_ipt_entry {
        struct ipt_ip ip;
        compat_uint_t nfcache;

-       u_int16_t target_offset;
-       u_int16_t next_offset;
+       __u16 target_offset;
+       __u16 next_offset;

        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];
        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];

diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index c9784f7..f549adc 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -81,14 +81,14 @@ struct ip6t_ip6 {
         *   MH do not match any packets.
         * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
         */
         *   MH do not match any packets.
         * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
         */

-       u_int16_t proto;
+       __u16 proto;

        /* TOS to match iff flags & IP6T_F_TOS */
        /* TOS to match iff flags & IP6T_F_TOS */

-       u_int8_t tos;
+       __u8 tos;

 
        /* Flags word */
 
        /* Flags word */

-       u_int8_t flags;
+       __u8 flags;

        /* Inverse flags */
        /* Inverse flags */

-       u_int8_t invflags;
+       __u8 invflags;

 };
 
 /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
 };
 
 /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */


@@ -118,9 +118,9 @@ struct ip6t_entry {
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */

-       u_int16_t target_offset;
+       __u16 target_offset;

        /* Size of ipt_entry + matches + target */
        /* Size of ipt_entry + matches + target */

-       u_int16_t next_offset;
+       __u16 next_offset;

 
        /* Back pointer */
        unsigned int comefrom;
 
        /* Back pointer */
        unsigned int comefrom;


@@ -186,9 +186,9 @@ struct ip6t_error {
 
 /* ICMP matching stuff */
 struct ip6t_icmp {
 
 /* ICMP matching stuff */
 struct ip6t_icmp {

-       u_int8_t type;                          /* type to match */
-       u_int8_t code[2];                       /* range of code */
-       u_int8_t invflags;                      /* Inverse flags */
+       __u8 type;                              /* type to match */
+       __u8 code[2];                           /* range of code */
+       __u8 invflags;                          /* Inverse flags */

 };
 
 /* Values for "inv" field for struct ipt_icmp. */
 };
 
 /* Values for "inv" field for struct ipt_icmp. */


@@ -298,8 +298,8 @@ extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 struct compat_ip6t_entry {
        struct ip6t_ip6 ipv6;
        compat_uint_t nfcache;
 struct compat_ip6t_entry {
        struct ip6t_ip6 ipv6;
        compat_uint_t nfcache;

-       u_int16_t target_offset;
-       u_int16_t next_offset;
+       __u16 target_offset;
+       __u16 next_offset;

        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];
        compat_uint_t comefrom;
        struct compat_xt_counters counters;
        unsigned char elems[0];