aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-28 17:21:07 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:02:59 -0400
commit59b8bfd8fd608821e5addc9f4682c7f2424afd8c (patch)
treec360a29cf3c2a975149ebe9b4106a8e4eea40528 /net
parentd77072ecfb6d28287d5e2a61d60d87a3a444ac97 (diff)
[NETFILTER]: netfilter misc annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter.c4
-rw-r--r--net/ipv4/netfilter/arp_tables.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index f88347de21a9..5ac15379a0cf 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -128,8 +128,8 @@ EXPORT_SYMBOL(ip_nat_decode_session);
128 */ 128 */
129 129
130struct ip_rt_info { 130struct ip_rt_info {
131 u_int32_t daddr; 131 __be32 daddr;
132 u_int32_t saddr; 132 __be32 saddr;
133 u_int8_t tos; 133 u_int8_t tos;
134}; 134};
135 135
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index 85f0d73ebfb4..17e1a687ab45 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -80,7 +80,7 @@ static inline int arp_packet_match(const struct arphdr *arphdr,
80{ 80{
81 char *arpptr = (char *)(arphdr + 1); 81 char *arpptr = (char *)(arphdr + 1);
82 char *src_devaddr, *tgt_devaddr; 82 char *src_devaddr, *tgt_devaddr;
83 u32 src_ipaddr, tgt_ipaddr; 83 __be32 src_ipaddr, tgt_ipaddr;
84 int i, ret; 84 int i, ret;
85 85
86#define FWINV(bool,invflg) ((bool) ^ !!(arpinfo->invflags & invflg)) 86#define FWINV(bool,invflg) ((bool) ^ !!(arpinfo->invflags & invflg))