Commit b51bdad6 authored by Mike Frysinger's avatar Mike Frysinger Committed by David S. Miller
Browse files

headers: use __aligned_xx types for userspace 



Now that we finally have __aligned_xx exported to userspace, convert
the headers that get exported over to the proper type.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b1e960f

include/linux/if_ppp.h

+8 −8
Original line number Diff line number Diff line
@@ -114,14 +114,14 @@ struct pppol2tp_ioc_stats { 
	__u16		tunnel_id;	/* redundant */

	__u16		session_id;	/* if zero, get tunnel stats */

	__u32		using_ipsec:1;	/* valid only for session_id == 0 */

	aligned_u64	tx_packets;

	aligned_u64	tx_bytes;

	aligned_u64	tx_errors;

	aligned_u64	rx_packets;

	aligned_u64	rx_bytes;

	aligned_u64	rx_seq_discards;

	aligned_u64	rx_oos_packets;

	aligned_u64	rx_errors;

	__aligned_u64	tx_packets;

	__aligned_u64	tx_bytes;

	__aligned_u64	tx_errors;

	__aligned_u64	rx_packets;

	__aligned_u64	rx_bytes;

	__aligned_u64	rx_seq_discards;

	__aligned_u64	rx_oos_packets;

	__aligned_u64	rx_errors;

};



#define ifr__name       b.ifr_ifrn.ifrn_name

include/linux/netfilter/nfnetlink_log.h

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ struct nfulnl_msg_packet_hw { 
};



struct nfulnl_msg_packet_timestamp {

	aligned_be64	sec;

	aligned_be64	usec;

	__aligned_be64	sec;

	__aligned_be64	usec;

};



enum nfulnl_attr_type {

include/linux/netfilter/nfnetlink_queue.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ struct nfqnl_msg_packet_hw { 
};



struct nfqnl_msg_packet_timestamp {

	aligned_be64	sec;

	aligned_be64	usec;

	__aligned_be64	sec;

	__aligned_be64	usec;

};



enum nfqnl_attr_type {

include/linux/netfilter/xt_connbytes.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ enum xt_connbytes_direction { 


struct xt_connbytes_info {

	struct {

		aligned_u64 from;	/* count to be matched */

		aligned_u64 to;		/* count to be matched */

		__aligned_u64 from;	/* count to be matched */

		__aligned_u64 to;	/* count to be matched */

	} count;

	__u8 what;		/* ipt_connbytes_what */

	__u8 direction;	/* ipt_connbytes_direction */

include/linux/netfilter/xt_quota.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct xt_quota_priv; 
struct xt_quota_info {

	__u32 flags;

	__u32 pad;

	aligned_u64 quota;

	__aligned_u64 quota;



	/* Used internally by the kernel */

	struct xt_quota_priv	*master;