[NETFILTER]: nfnetlink: remove unnecessary packed attributes (53e26658) · Commits · 戴 / test

include/linux/netfilter/nfnetlink.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ struct nfattr
		u_int16_t nfa_len;
		u_int16_t nfa_type; /* we use 15 bits for the type, and the highest
		* bit to indicate whether the payload is nested */
		} __attribute__ ((packed));
		};

		/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
		* rtnetlink.h, it's time to put this in a generic file */
		@@ -79,7 +79,7 @@ struct nfgenmsg {
		u_int8_t nfgen_family; /* AF_xxx */
		u_int8_t version; /* nfnetlink version */
		u_int16_t res_id; /* resource id */
		} __attribute__ ((packed));
		};

		#define NFNETLINK_V0 0

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,18 +19,18 @@ struct nfulnl_msg_packet_hdr {
		u_int16_t hw_protocol; /* hw protocol (network order) */
		u_int8_t hook; /* netfilter hook */
		u_int8_t _pad;
		} __attribute__ ((packed));
		};

		struct nfulnl_msg_packet_hw {
		u_int16_t hw_addrlen;
		u_int16_t _pad;
		u_int8_t hw_addr[8];
		} __attribute__ ((packed));
		};

		struct nfulnl_msg_packet_timestamp {
		aligned_u64 sec;
		aligned_u64 usec;
		} __attribute__ ((packed));
		};

		#define NFULNL_PREFIXLEN 30 /* just like old log target */

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,12 +22,12 @@ struct nfqnl_msg_packet_hw {
		u_int16_t hw_addrlen;
		u_int16_t _pad;
		u_int8_t hw_addr[8];
		} __attribute__ ((packed));
		};

		struct nfqnl_msg_packet_timestamp {
		aligned_u64 sec;
		aligned_u64 usec;
		} __attribute__ ((packed));
		};

		enum nfqnl_attr_type {
		NFQA_UNSPEC,
		@@ -49,7 +49,7 @@ enum nfqnl_attr_type {
		struct nfqnl_msg_verdict_hdr {
		u_int32_t verdict;
		u_int32_t id;
		} __attribute__ ((packed));
		};


		enum nfqnl_msg_config_cmds {
		@@ -64,7 +64,7 @@ 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 */
		} __attribute__ ((packed));
		};

		enum nfqnl_config_mode {
		NFQNL_COPY_NONE,