diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-28 14:21:07 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 18:02:59 -0700 |
commit | 59b8bfd8fd608821e5addc9f4682c7f2424afd8c (patch) | |
tree | c360a29cf3c2a975149ebe9b4106a8e4eea40528 /include/linux | |
parent | d77072ecfb6d28287d5e2a61d60d87a3a444ac97 (diff) | |
download | kernel_samsung_smdk4412-59b8bfd8fd608821e5addc9f4682c7f2424afd8c.zip kernel_samsung_smdk4412-59b8bfd8fd608821e5addc9f4682c7f2424afd8c.tar.gz kernel_samsung_smdk4412-59b8bfd8fd608821e5addc9f4682c7f2424afd8c.tar.bz2 |
[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 'include/linux')
-rw-r--r-- | include/linux/netfilter_arp/arp_tables.h | 6 | ||||
-rw-r--r-- | include/linux/netfilter_ipv4/ip_queue.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index 149e87c..44e39b6 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h @@ -46,11 +46,11 @@ struct arpt_arp { struct arpt_devaddr_info tgt_devaddr; /* ARP operation code. */ - u_int16_t arpop, arpop_mask; + __be16 arpop, arpop_mask; /* ARP hardware address and protocol address format. */ - u_int16_t arhrd, arhrd_mask; - u_int16_t arpro, arpro_mask; + __be16 arhrd, arhrd_mask; + __be16 arpro, arpro_mask; /* The protocol address length is only accepted if it is 4 * so there is no use in offering a way to do filtering on it. diff --git a/include/linux/netfilter_ipv4/ip_queue.h b/include/linux/netfilter_ipv4/ip_queue.h index aa08d68..a03507f 100644 --- a/include/linux/netfilter_ipv4/ip_queue.h +++ b/include/linux/netfilter_ipv4/ip_queue.h @@ -26,7 +26,7 @@ typedef struct ipq_packet_msg { unsigned int hook; /* Netfilter hook we rode in on */ char indev_name[IFNAMSIZ]; /* Name of incoming interface */ char outdev_name[IFNAMSIZ]; /* Name of outgoing interface */ - unsigned short hw_protocol; /* Hardware protocol (network order) */ + __be16 hw_protocol; /* Hardware protocol (network order) */ unsigned short hw_type; /* Hardware type */ unsigned char hw_addrlen; /* Hardware address length */ unsigned char hw_addr[8]; /* Hardware address */ |