diff options
| author |   Ben Hutchings <ben@decadent.org.uk> | 2011-08-24 18:44:57 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-08-26 12:02:50 -0400 |
| commit | 7ff30c43f316f1febcfb6e84d511ab34ea433e7b (patch) | |
| tree | 597da153649ad5c1f7e0934749d96d3bb9cb3bca /include/linux/netfilter_arp | |
| parent | headers, net: Use __kernel_sa_family_t in more definitions shared with userland (diff) | |
| download | linux-dev-7ff30c43f316f1febcfb6e84d511ab34ea433e7b.tar.xz linux-dev-7ff30c43f316f1febcfb6e84d511ab34ea433e7b.zip | |
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>
Diffstat (limited to 'include/linux/netfilter_arp')
| -rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index adbf4bff87ed..e08565d45178 100644 --- 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 */ - u_int8_t arhln, arhln_mask; + __u8 arhln, arhln_mask; 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 */ - u_int8_t flags; + __u8 flags; /* Inverse flags */ - u_int16_t invflags; + __u16 invflags; }; /* 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 */ - u_int16_t target_offset; + __u16 target_offset; /* Size of arpt_entry + matches + target */ - u_int16_t next_offset; + __u16 next_offset; /* 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; - 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]; |