diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/at76c50x-usb.h | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.h')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/at76c50x-usb.h index 1ec5ccffdbc0..972ea0fc1a0b 100644 --- a/drivers/net/wireless/at76c50x-usb.h +++ b/drivers/net/wireless/at76c50x-usb.h | |||
@@ -99,7 +99,7 @@ struct hwcfg_r505 { | |||
99 | u8 reserved2[14]; | 99 | u8 reserved2[14]; |
100 | u8 cr15_values[14]; | 100 | u8 cr15_values[14]; |
101 | u8 reserved3[3]; | 101 | u8 reserved3[3]; |
102 | } __attribute__((packed)); | 102 | } __packed; |
103 | 103 | ||
104 | struct hwcfg_rfmd { | 104 | struct hwcfg_rfmd { |
105 | u8 cr20_values[14]; | 105 | u8 cr20_values[14]; |
@@ -111,7 +111,7 @@ struct hwcfg_rfmd { | |||
111 | u8 low_power_values[14]; | 111 | u8 low_power_values[14]; |
112 | u8 normal_power_values[14]; | 112 | u8 normal_power_values[14]; |
113 | u8 reserved1[3]; | 113 | u8 reserved1[3]; |
114 | } __attribute__((packed)); | 114 | } __packed; |
115 | 115 | ||
116 | struct hwcfg_intersil { | 116 | struct hwcfg_intersil { |
117 | u8 mac_addr[ETH_ALEN]; | 117 | u8 mac_addr[ETH_ALEN]; |
@@ -120,7 +120,7 @@ struct hwcfg_intersil { | |||
120 | u8 pidvid[4]; | 120 | u8 pidvid[4]; |
121 | u8 regulatory_domain; | 121 | u8 regulatory_domain; |
122 | u8 reserved[1]; | 122 | u8 reserved[1]; |
123 | } __attribute__((packed)); | 123 | } __packed; |
124 | 124 | ||
125 | union at76_hwcfg { | 125 | union at76_hwcfg { |
126 | struct hwcfg_intersil i; | 126 | struct hwcfg_intersil i; |
@@ -149,14 +149,14 @@ struct at76_card_config { | |||
149 | u8 ssid_len; | 149 | u8 ssid_len; |
150 | u8 short_preamble; | 150 | u8 short_preamble; |
151 | __le16 beacon_period; | 151 | __le16 beacon_period; |
152 | } __attribute__((packed)); | 152 | } __packed; |
153 | 153 | ||
154 | struct at76_command { | 154 | struct at76_command { |
155 | u8 cmd; | 155 | u8 cmd; |
156 | u8 reserved; | 156 | u8 reserved; |
157 | __le16 size; | 157 | __le16 size; |
158 | u8 data[0]; | 158 | u8 data[0]; |
159 | } __attribute__((packed)); | 159 | } __packed; |
160 | 160 | ||
161 | /* Length of Atmel-specific Rx header before 802.11 frame */ | 161 | /* Length of Atmel-specific Rx header before 802.11 frame */ |
162 | #define AT76_RX_HDRLEN offsetof(struct at76_rx_buffer, packet) | 162 | #define AT76_RX_HDRLEN offsetof(struct at76_rx_buffer, packet) |
@@ -171,7 +171,7 @@ struct at76_rx_buffer { | |||
171 | u8 noise_level; | 171 | u8 noise_level; |
172 | __le32 rx_time; | 172 | __le32 rx_time; |
173 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; | 173 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; |
174 | } __attribute__((packed)); | 174 | } __packed; |
175 | 175 | ||
176 | /* Length of Atmel-specific Tx header before 802.11 frame */ | 176 | /* Length of Atmel-specific Tx header before 802.11 frame */ |
177 | #define AT76_TX_HDRLEN offsetof(struct at76_tx_buffer, packet) | 177 | #define AT76_TX_HDRLEN offsetof(struct at76_tx_buffer, packet) |
@@ -182,7 +182,7 @@ struct at76_tx_buffer { | |||
182 | u8 padding; | 182 | u8 padding; |
183 | u8 reserved[4]; | 183 | u8 reserved[4]; |
184 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; | 184 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; |
185 | } __attribute__((packed)); | 185 | } __packed; |
186 | 186 | ||
187 | /* defines for scan_type below */ | 187 | /* defines for scan_type below */ |
188 | #define SCAN_TYPE_ACTIVE 0 | 188 | #define SCAN_TYPE_ACTIVE 0 |
@@ -198,7 +198,7 @@ struct at76_req_scan { | |||
198 | __le16 max_channel_time; | 198 | __le16 max_channel_time; |
199 | u8 essid_size; | 199 | u8 essid_size; |
200 | u8 international_scan; | 200 | u8 international_scan; |
201 | } __attribute__((packed)); | 201 | } __packed; |
202 | 202 | ||
203 | struct at76_req_ibss { | 203 | struct at76_req_ibss { |
204 | u8 bssid[ETH_ALEN]; | 204 | u8 bssid[ETH_ALEN]; |
@@ -207,7 +207,7 @@ struct at76_req_ibss { | |||
207 | u8 channel; | 207 | u8 channel; |
208 | u8 essid_size; | 208 | u8 essid_size; |
209 | u8 reserved[3]; | 209 | u8 reserved[3]; |
210 | } __attribute__((packed)); | 210 | } __packed; |
211 | 211 | ||
212 | struct at76_req_join { | 212 | struct at76_req_join { |
213 | u8 bssid[ETH_ALEN]; | 213 | u8 bssid[ETH_ALEN]; |
@@ -217,7 +217,7 @@ struct at76_req_join { | |||
217 | __le16 timeout; | 217 | __le16 timeout; |
218 | u8 essid_size; | 218 | u8 essid_size; |
219 | u8 reserved; | 219 | u8 reserved; |
220 | } __attribute__((packed)); | 220 | } __packed; |
221 | 221 | ||
222 | struct set_mib_buffer { | 222 | struct set_mib_buffer { |
223 | u8 type; | 223 | u8 type; |
@@ -229,7 +229,7 @@ struct set_mib_buffer { | |||
229 | __le16 word; | 229 | __le16 word; |
230 | u8 addr[ETH_ALEN]; | 230 | u8 addr[ETH_ALEN]; |
231 | } data; | 231 | } data; |
232 | } __attribute__((packed)); | 232 | } __packed; |
233 | 233 | ||
234 | struct mib_local { | 234 | struct mib_local { |
235 | u16 reserved0; | 235 | u16 reserved0; |
@@ -241,14 +241,14 @@ struct mib_local { | |||
241 | u16 reserved2; | 241 | u16 reserved2; |
242 | u8 preamble_type; | 242 | u8 preamble_type; |
243 | u16 reserved3; | 243 | u16 reserved3; |
244 | } __attribute__((packed)); | 244 | } __packed; |
245 | 245 | ||
246 | struct mib_mac_addr { | 246 | struct mib_mac_addr { |
247 | u8 mac_addr[ETH_ALEN]; | 247 | u8 mac_addr[ETH_ALEN]; |
248 | u8 res[2]; /* ??? */ | 248 | u8 res[2]; /* ??? */ |
249 | u8 group_addr[4][ETH_ALEN]; | 249 | u8 group_addr[4][ETH_ALEN]; |
250 | u8 group_addr_status[4]; | 250 | u8 group_addr_status[4]; |
251 | } __attribute__((packed)); | 251 | } __packed; |
252 | 252 | ||
253 | struct mib_mac { | 253 | struct mib_mac { |
254 | __le32 max_tx_msdu_lifetime; | 254 | __le32 max_tx_msdu_lifetime; |
@@ -269,7 +269,7 @@ struct mib_mac { | |||
269 | u8 desired_bssid[ETH_ALEN]; | 269 | u8 desired_bssid[ETH_ALEN]; |
270 | u8 desired_bsstype; /* ad-hoc or infrastructure */ | 270 | u8 desired_bsstype; /* ad-hoc or infrastructure */ |
271 | u8 reserved2; | 271 | u8 reserved2; |
272 | } __attribute__((packed)); | 272 | } __packed; |
273 | 273 | ||
274 | struct mib_mac_mgmt { | 274 | struct mib_mac_mgmt { |
275 | __le16 beacon_period; | 275 | __le16 beacon_period; |
@@ -292,7 +292,7 @@ struct mib_mac_mgmt { | |||
292 | u8 multi_domain_capability_enabled; | 292 | u8 multi_domain_capability_enabled; |
293 | u8 country_string[3]; | 293 | u8 country_string[3]; |
294 | u8 reserved[3]; | 294 | u8 reserved[3]; |
295 | } __attribute__((packed)); | 295 | } __packed; |
296 | 296 | ||
297 | struct mib_mac_wep { | 297 | struct mib_mac_wep { |
298 | u8 privacy_invoked; /* 0 disable encr., 1 enable encr */ | 298 | u8 privacy_invoked; /* 0 disable encr., 1 enable encr */ |
@@ -303,7 +303,7 @@ struct mib_mac_wep { | |||
303 | __le32 wep_excluded_count; | 303 | __le32 wep_excluded_count; |
304 | u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN]; | 304 | u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN]; |
305 | u8 encryption_level; /* 1 for 40bit, 2 for 104bit encryption */ | 305 | u8 encryption_level; /* 1 for 40bit, 2 for 104bit encryption */ |
306 | } __attribute__((packed)); | 306 | } __packed; |
307 | 307 | ||
308 | struct mib_phy { | 308 | struct mib_phy { |
309 | __le32 ed_threshold; | 309 | __le32 ed_threshold; |
@@ -320,19 +320,19 @@ struct mib_phy { | |||
320 | u8 current_cca_mode; | 320 | u8 current_cca_mode; |
321 | u8 phy_type; | 321 | u8 phy_type; |
322 | u8 current_reg_domain; | 322 | u8 current_reg_domain; |
323 | } __attribute__((packed)); | 323 | } __packed; |
324 | 324 | ||
325 | struct mib_fw_version { | 325 | struct mib_fw_version { |
326 | u8 major; | 326 | u8 major; |
327 | u8 minor; | 327 | u8 minor; |
328 | u8 patch; | 328 | u8 patch; |
329 | u8 build; | 329 | u8 build; |
330 | } __attribute__((packed)); | 330 | } __packed; |
331 | 331 | ||
332 | struct mib_mdomain { | 332 | struct mib_mdomain { |
333 | u8 tx_powerlevel[14]; | 333 | u8 tx_powerlevel[14]; |
334 | u8 channel_list[14]; /* 0 for invalid channels */ | 334 | u8 channel_list[14]; /* 0 for invalid channels */ |
335 | } __attribute__((packed)); | 335 | } __packed; |
336 | 336 | ||
337 | struct at76_fw_header { | 337 | struct at76_fw_header { |
338 | __le32 crc; /* CRC32 of the whole image */ | 338 | __le32 crc; /* CRC32 of the whole image */ |
@@ -346,7 +346,7 @@ struct at76_fw_header { | |||
346 | __le32 int_fw_len; /* internal firmware image length */ | 346 | __le32 int_fw_len; /* internal firmware image length */ |
347 | __le32 ext_fw_offset; /* external firmware image offset */ | 347 | __le32 ext_fw_offset; /* external firmware image offset */ |
348 | __le32 ext_fw_len; /* external firmware image length */ | 348 | __le32 ext_fw_len; /* external firmware image length */ |
349 | } __attribute__((packed)); | 349 | } __packed; |
350 | 350 | ||
351 | /* a description of a regulatory domain and the allowed channels */ | 351 | /* a description of a regulatory domain and the allowed channels */ |
352 | struct reg_domain { | 352 | struct reg_domain { |