Commit 98a4a861 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[NETFILTER]: trivial annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e11c91e

include/linux/netfilter/nfnetlink.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct nfattr 
struct nfgenmsg {

	u_int8_t  nfgen_family;		/* AF_xxx */

	u_int8_t  version;		/* nfnetlink version */

	u_int16_t res_id;		/* resource id */

	__be16    res_id;		/* resource id */

};



#define NFNETLINK_V0	0

include/linux/netfilter/nfnetlink_log.h

+5 −5
Original line number Diff line number Diff line
@@ -16,20 +16,20 @@ enum nfulnl_msg_types { 
};



struct nfulnl_msg_packet_hdr {

	u_int16_t	hw_protocol;	/* hw protocol (network order) */

	__be16		hw_protocol;	/* hw protocol (network order) */

	u_int8_t	hook;		/* netfilter hook */

	u_int8_t	_pad;

};



struct nfulnl_msg_packet_hw {

	u_int16_t	hw_addrlen;

	__be16		hw_addrlen;

	u_int16_t	_pad;

	u_int8_t	hw_addr[8];

};



struct nfulnl_msg_packet_timestamp {

	aligned_u64	sec;

	aligned_u64	usec;

	aligned_be64	sec;

	aligned_be64	usec;

};



#define NFULNL_PREFIXLEN	30	/* just like old log target */
@@ -67,7 +67,7 @@ struct nfulnl_msg_config_cmd { 
} __attribute__ ((packed));



struct nfulnl_msg_config_mode {

	u_int32_t	copy_range;

	__be32		copy_range;

	u_int8_t	copy_mode;

	u_int8_t	_pad;

} __attribute__ ((packed));

include/linux/netfilter/nfnetlink_queue.h

+9 −9
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ enum nfqnl_msg_types { 
};



struct nfqnl_msg_packet_hdr {

	u_int32_t	packet_id;	/* unique ID of packet in queue */

	u_int16_t	hw_protocol;	/* hw protocol (network order) */

	__be32		packet_id;	/* unique ID of packet in queue */

	__be16		hw_protocol;	/* hw protocol (network order) */

	u_int8_t	hook;		/* netfilter hook */

} __attribute__ ((packed));



struct nfqnl_msg_packet_hw {

	u_int16_t	hw_addrlen;

	__be16		hw_addrlen;

	u_int16_t	_pad;

	u_int8_t	hw_addr[8];

};



struct nfqnl_msg_packet_timestamp {

	aligned_u64	sec;

	aligned_u64	usec;

	aligned_be64	sec;

	aligned_be64	usec;

};



enum nfqnl_attr_type {
@@ -47,8 +47,8 @@ enum nfqnl_attr_type { 
#define NFQA_MAX (__NFQA_MAX - 1)



struct nfqnl_msg_verdict_hdr {

	u_int32_t verdict;

	u_int32_t id;

	__be32 verdict;

	__be32 id;

};
@@ -63,7 +63,7 @@ enum nfqnl_msg_config_cmds { 
struct nfqnl_msg_config_cmd {

	u_int8_t	command;	/* nfqnl_msg_config_cmds */

	u_int8_t	_pad;

	u_int16_t	pf;		/* AF_xxx for PF_[UN]BIND */

	__be16		pf;		/* AF_xxx for PF_[UN]BIND */

};



enum nfqnl_config_mode {
@@ -73,7 +73,7 @@ enum nfqnl_config_mode { 
};



struct nfqnl_msg_config_params {

	u_int32_t	copy_range;

	__be32		copy_range;

	u_int8_t	copy_mode;	/* enum nfqnl_config_mode */

} __attribute__ ((packed));

include/linux/netfilter/xt_conntrack.h

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ 
struct ip_conntrack_old_tuple

{

	struct {

		__u32 ip;

		__be32 ip;

		union {

			__u16 all;

		} u;

	} src;



	struct {

		__u32 ip;

		__be32 ip;

		union {

			__u16 all;

		} u;

include/linux/netfilter/xt_policy.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct xt_policy_elem 
	union xt_policy_addr	smask;

	union xt_policy_addr	daddr;

	union xt_policy_addr	dmask;

	u_int32_t		spi;

	__be32			spi;

	u_int32_t		reqid;

	u_int8_t		proto;

	u_int8_t		mode;