openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NETFILTER]: netfilter misc annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-09-28 14:21:07 -07:00 committed by David S. Miller
parent d77072ecfb
commit 59b8bfd8fd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netfilter_arp/arp_tables.h
View File

@ -46,11 +46,11 @@ struct arpt_arp {
struct arpt_devaddr_info tgt_devaddr; struct arpt_devaddr_info tgt_devaddr;
/* ARP operation code. */ /* ARP operation code. */
u_int16_t arpop, arpop_mask; __be16 arpop, arpop_mask;
/* ARP hardware address and protocol address format. */ /* ARP hardware address and protocol address format. */
u_int16_t arhrd, arhrd_mask; __be16 arhrd, arhrd_mask;
u_int16_t arpro, arpro_mask; __be16 arpro, arpro_mask;
/* The protocol address length is only accepted if it is 4 /* 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. * so there is no use in offering a way to do filtering on it.

2
include/linux/netfilter_ipv4/ip_queue.h
View File

@ -26,7 +26,7 @@ typedef struct ipq_packet_msg {
unsigned int hook; /* Netfilter hook we rode in on */ unsigned int hook; /* Netfilter hook we rode in on */
char indev_name[IFNAMSIZ]; /* Name of incoming interface */ char indev_name[IFNAMSIZ]; /* Name of incoming interface */
char outdev_name[IFNAMSIZ]; /* Name of outgoing 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 short hw_type; /* Hardware type */
unsigned char hw_addrlen; /* Hardware address length */ unsigned char hw_addrlen; /* Hardware address length */
unsigned char hw_addr[8]; /* Hardware address */ unsigned char hw_addr[8]; /* Hardware address */

4
net/ipv4/netfilter.c
View File

@ -128,8 +128,8 @@ EXPORT_SYMBOL(ip_nat_decode_session);
*/ */
struct ip_rt_info { struct ip_rt_info {
u_int32_t daddr; __be32 daddr;
u_int32_t saddr; __be32 saddr;
u_int8_t tos; u_int8_t tos;
}; };

2
net/ipv4/netfilter/arp_tables.c
View File

@ -80,7 +80,7 @@ static inline int arp_packet_match(const struct arphdr *arphdr,
{ {
char *arpptr = (char *)(arphdr + 1); char *arpptr = (char *)(arphdr + 1);
char *src_devaddr, *tgt_devaddr; char *src_devaddr, *tgt_devaddr;
u32 src_ipaddr, tgt_ipaddr; __be32 src_ipaddr, tgt_ipaddr;
int i, ret; int i, ret;
#define FWINV(bool,invflg) ((bool) ^ !!(arpinfo->invflags & invflg)) #define FWINV(bool,invflg) ((bool) ^ !!(arpinfo->invflags & invflg))