diff options
author | Arnd Bergmann <arnd@arndb.de> | 2009-02-25 18:51:40 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:14:15 -0400 |
commit | 9adfbfb611307060db54691bc7e6d53fdc12312b (patch) | |
tree | 35d2fb021c0a4e8d2980af114363bff714301aae /include/linux/if_arcnet.h | |
parent | 85efde6f4e0de9577256c5f0030088d3fd4347c1 (diff) |
make most exported headers use strict integer types
This takes care of all files that have only a small number
of non-strict integer type uses.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: netdev@vger.kernel.org
Cc: linux-ppp@vger.kernel.org
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/if_arcnet.h')
-rw-r--r-- | include/linux/if_arcnet.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h index 27ea2ac445ad..0835debab115 100644 --- a/include/linux/if_arcnet.h +++ b/include/linux/if_arcnet.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #ifndef _LINUX_IF_ARCNET_H | 16 | #ifndef _LINUX_IF_ARCNET_H |
17 | #define _LINUX_IF_ARCNET_H | 17 | #define _LINUX_IF_ARCNET_H |
18 | 18 | ||
19 | #include <linux/types.h> | ||
19 | #include <linux/if_ether.h> | 20 | #include <linux/if_ether.h> |
20 | 21 | ||
21 | 22 | ||
@@ -57,10 +58,10 @@ | |||
57 | */ | 58 | */ |
58 | struct arc_rfc1201 | 59 | struct arc_rfc1201 |
59 | { | 60 | { |
60 | uint8_t proto; /* protocol ID field - varies */ | 61 | __u8 proto; /* protocol ID field - varies */ |
61 | uint8_t split_flag; /* for use with split packets */ | 62 | __u8 split_flag; /* for use with split packets */ |
62 | __be16 sequence; /* sequence number */ | 63 | __be16 sequence; /* sequence number */ |
63 | uint8_t payload[0]; /* space remaining in packet (504 bytes)*/ | 64 | __u8 payload[0]; /* space remaining in packet (504 bytes)*/ |
64 | }; | 65 | }; |
65 | #define RFC1201_HDR_SIZE 4 | 66 | #define RFC1201_HDR_SIZE 4 |
66 | 67 | ||
@@ -70,8 +71,8 @@ struct arc_rfc1201 | |||
70 | */ | 71 | */ |
71 | struct arc_rfc1051 | 72 | struct arc_rfc1051 |
72 | { | 73 | { |
73 | uint8_t proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */ | 74 | __u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */ |
74 | uint8_t payload[0]; /* 507 bytes */ | 75 | __u8 payload[0]; /* 507 bytes */ |
75 | }; | 76 | }; |
76 | #define RFC1051_HDR_SIZE 1 | 77 | #define RFC1051_HDR_SIZE 1 |
77 | 78 | ||
@@ -82,20 +83,20 @@ struct arc_rfc1051 | |||
82 | */ | 83 | */ |
83 | struct arc_eth_encap | 84 | struct arc_eth_encap |
84 | { | 85 | { |
85 | uint8_t proto; /* Always ARC_P_ETHER */ | 86 | __u8 proto; /* Always ARC_P_ETHER */ |
86 | struct ethhdr eth; /* standard ethernet header (yuck!) */ | 87 | struct ethhdr eth; /* standard ethernet header (yuck!) */ |
87 | uint8_t payload[0]; /* 493 bytes */ | 88 | __u8 payload[0]; /* 493 bytes */ |
88 | }; | 89 | }; |
89 | #define ETH_ENCAP_HDR_SIZE 14 | 90 | #define ETH_ENCAP_HDR_SIZE 14 |
90 | 91 | ||
91 | 92 | ||
92 | struct arc_cap | 93 | struct arc_cap |
93 | { | 94 | { |
94 | uint8_t proto; | 95 | __u8 proto; |
95 | uint8_t cookie[sizeof(int)]; /* Actually NOT sent over the network */ | 96 | __u8 cookie[sizeof(int)]; /* Actually NOT sent over the network */ |
96 | union { | 97 | union { |
97 | uint8_t ack; | 98 | __u8 ack; |
98 | uint8_t raw[0]; /* 507 bytes */ | 99 | __u8 raw[0]; /* 507 bytes */ |
99 | } mes; | 100 | } mes; |
100 | }; | 101 | }; |
101 | 102 | ||
@@ -109,7 +110,7 @@ struct arc_cap | |||
109 | */ | 110 | */ |
110 | struct arc_hardware | 111 | struct arc_hardware |
111 | { | 112 | { |
112 | uint8_t source, /* source ARCnet - filled in automagically */ | 113 | __u8 source, /* source ARCnet - filled in automagically */ |
113 | dest, /* destination ARCnet - 0 for broadcast */ | 114 | dest, /* destination ARCnet - 0 for broadcast */ |
114 | offset[2]; /* offset bytes (some weird semantics) */ | 115 | offset[2]; /* offset bytes (some weird semantics) */ |
115 | }; | 116 | }; |
@@ -130,7 +131,7 @@ struct archdr | |||
130 | struct arc_rfc1051 rfc1051; | 131 | struct arc_rfc1051 rfc1051; |
131 | struct arc_eth_encap eth_encap; | 132 | struct arc_eth_encap eth_encap; |
132 | struct arc_cap cap; | 133 | struct arc_cap cap; |
133 | uint8_t raw[0]; /* 508 bytes */ | 134 | __u8 raw[0]; /* 508 bytes */ |
134 | } soft; | 135 | } soft; |
135 | }; | 136 | }; |
136 | 137 | ||