Commit b51bdad63046d1d5a4807630cc8c02845cf67893
Committed by
David S. Miller
1 parent
6b1e960fdb
Exists in
master
and in
39 other branches
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: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 5 changed files with 15 additions and 15 deletions Side-by-side Diff
include/linux/if_ppp.h
... | ... | @@ -114,14 +114,14 @@ |
114 | 114 | __u16 tunnel_id; /* redundant */ |
115 | 115 | __u16 session_id; /* if zero, get tunnel stats */ |
116 | 116 | __u32 using_ipsec:1; /* valid only for session_id == 0 */ |
117 | - aligned_u64 tx_packets; | |
118 | - aligned_u64 tx_bytes; | |
119 | - aligned_u64 tx_errors; | |
120 | - aligned_u64 rx_packets; | |
121 | - aligned_u64 rx_bytes; | |
122 | - aligned_u64 rx_seq_discards; | |
123 | - aligned_u64 rx_oos_packets; | |
124 | - aligned_u64 rx_errors; | |
117 | + __aligned_u64 tx_packets; | |
118 | + __aligned_u64 tx_bytes; | |
119 | + __aligned_u64 tx_errors; | |
120 | + __aligned_u64 rx_packets; | |
121 | + __aligned_u64 rx_bytes; | |
122 | + __aligned_u64 rx_seq_discards; | |
123 | + __aligned_u64 rx_oos_packets; | |
124 | + __aligned_u64 rx_errors; | |
125 | 125 | }; |
126 | 126 | |
127 | 127 | #define ifr__name b.ifr_ifrn.ifrn_name |
include/linux/netfilter/nfnetlink_log.h
include/linux/netfilter/nfnetlink_queue.h
include/linux/netfilter/xt_connbytes.h
... | ... | @@ -17,8 +17,8 @@ |
17 | 17 | |
18 | 18 | struct xt_connbytes_info { |
19 | 19 | struct { |
20 | - aligned_u64 from; /* count to be matched */ | |
21 | - aligned_u64 to; /* count to be matched */ | |
20 | + __aligned_u64 from; /* count to be matched */ | |
21 | + __aligned_u64 to; /* count to be matched */ | |
22 | 22 | } count; |
23 | 23 | __u8 what; /* ipt_connbytes_what */ |
24 | 24 | __u8 direction; /* ipt_connbytes_direction */ |