diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_cmd.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h index 4ad67cae94d2..7e70dd5a21b8 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.h +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h | |||
@@ -106,7 +106,7 @@ struct wl1251_cmd_header { | |||
106 | u16 status; | 106 | u16 status; |
107 | /* payload */ | 107 | /* payload */ |
108 | u8 data[0]; | 108 | u8 data[0]; |
109 | } __attribute__ ((packed)); | 109 | } __packed; |
110 | 110 | ||
111 | struct wl1251_command { | 111 | struct wl1251_command { |
112 | struct wl1251_cmd_header header; | 112 | struct wl1251_cmd_header header; |
@@ -201,7 +201,7 @@ struct wl1251_scan_parameters { | |||
201 | u8 ssid_len; | 201 | u8 ssid_len; |
202 | u8 ssid[32]; | 202 | u8 ssid[32]; |
203 | 203 | ||
204 | } __attribute__ ((packed)); | 204 | } __packed; |
205 | 205 | ||
206 | struct wl1251_scan_ch_parameters { | 206 | struct wl1251_scan_ch_parameters { |
207 | u32 min_duration; /* in TU */ | 207 | u32 min_duration; /* in TU */ |
@@ -218,7 +218,7 @@ struct wl1251_scan_ch_parameters { | |||
218 | u8 tx_power_att; | 218 | u8 tx_power_att; |
219 | u8 channel; | 219 | u8 channel; |
220 | u8 pad[3]; | 220 | u8 pad[3]; |
221 | } __attribute__ ((packed)); | 221 | } __packed; |
222 | 222 | ||
223 | /* SCAN parameters */ | 223 | /* SCAN parameters */ |
224 | #define SCAN_MAX_NUM_OF_CHANNELS 16 | 224 | #define SCAN_MAX_NUM_OF_CHANNELS 16 |
@@ -228,7 +228,7 @@ struct wl1251_cmd_scan { | |||
228 | 228 | ||
229 | struct wl1251_scan_parameters params; | 229 | struct wl1251_scan_parameters params; |
230 | struct wl1251_scan_ch_parameters channels[SCAN_MAX_NUM_OF_CHANNELS]; | 230 | struct wl1251_scan_ch_parameters channels[SCAN_MAX_NUM_OF_CHANNELS]; |
231 | } __attribute__ ((packed)); | 231 | } __packed; |
232 | 232 | ||
233 | enum { | 233 | enum { |
234 | BSS_TYPE_IBSS = 0, | 234 | BSS_TYPE_IBSS = 0, |
@@ -276,14 +276,14 @@ struct cmd_join { | |||
276 | u8 tx_mgt_frame_rate; /* OBSOLETE */ | 276 | u8 tx_mgt_frame_rate; /* OBSOLETE */ |
277 | u8 tx_mgt_frame_mod; /* OBSOLETE */ | 277 | u8 tx_mgt_frame_mod; /* OBSOLETE */ |
278 | u8 reserved; | 278 | u8 reserved; |
279 | } __attribute__ ((packed)); | 279 | } __packed; |
280 | 280 | ||
281 | struct cmd_enabledisable_path { | 281 | struct cmd_enabledisable_path { |
282 | struct wl1251_cmd_header header; | 282 | struct wl1251_cmd_header header; |
283 | 283 | ||
284 | u8 channel; | 284 | u8 channel; |
285 | u8 padding[3]; | 285 | u8 padding[3]; |
286 | } __attribute__ ((packed)); | 286 | } __packed; |
287 | 287 | ||
288 | #define WL1251_MAX_TEMPLATE_SIZE 300 | 288 | #define WL1251_MAX_TEMPLATE_SIZE 300 |
289 | 289 | ||
@@ -292,7 +292,7 @@ struct wl1251_cmd_packet_template { | |||
292 | 292 | ||
293 | __le16 size; | 293 | __le16 size; |
294 | u8 data[0]; | 294 | u8 data[0]; |
295 | } __attribute__ ((packed)); | 295 | } __packed; |
296 | 296 | ||
297 | #define TIM_ELE_ID 5 | 297 | #define TIM_ELE_ID 5 |
298 | #define PARTIAL_VBM_MAX 251 | 298 | #define PARTIAL_VBM_MAX 251 |
@@ -304,7 +304,7 @@ struct wl1251_tim { | |||
304 | u8 dtim_period; | 304 | u8 dtim_period; |
305 | u8 bitmap_ctrl; | 305 | u8 bitmap_ctrl; |
306 | u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */ | 306 | u8 pvb_field[PARTIAL_VBM_MAX]; /* Partial Virtual Bitmap */ |
307 | } __attribute__ ((packed)); | 307 | } __packed; |
308 | 308 | ||
309 | /* Virtual Bit Map update */ | 309 | /* Virtual Bit Map update */ |
310 | struct wl1251_cmd_vbm_update { | 310 | struct wl1251_cmd_vbm_update { |
@@ -312,7 +312,7 @@ struct wl1251_cmd_vbm_update { | |||
312 | __le16 len; | 312 | __le16 len; |
313 | u8 padding[2]; | 313 | u8 padding[2]; |
314 | struct wl1251_tim tim; | 314 | struct wl1251_tim tim; |
315 | } __attribute__ ((packed)); | 315 | } __packed; |
316 | 316 | ||
317 | enum wl1251_cmd_ps_mode { | 317 | enum wl1251_cmd_ps_mode { |
318 | STATION_ACTIVE_MODE, | 318 | STATION_ACTIVE_MODE, |
@@ -333,7 +333,7 @@ struct wl1251_cmd_ps_params { | |||
333 | u8 hang_over_period; | 333 | u8 hang_over_period; |
334 | u16 null_data_rate; | 334 | u16 null_data_rate; |
335 | u8 pad[2]; | 335 | u8 pad[2]; |
336 | } __attribute__ ((packed)); | 336 | } __packed; |
337 | 337 | ||
338 | struct wl1251_cmd_trigger_scan_to { | 338 | struct wl1251_cmd_trigger_scan_to { |
339 | struct wl1251_cmd_header header; | 339 | struct wl1251_cmd_header header; |
@@ -411,7 +411,7 @@ struct wl1251_cmd_set_keys { | |||
411 | u8 key[MAX_KEY_SIZE]; | 411 | u8 key[MAX_KEY_SIZE]; |
412 | u16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY]; | 412 | u16 ac_seq_num16[NUM_ACCESS_CATEGORIES_COPY]; |
413 | u32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY]; | 413 | u32 ac_seq_num32[NUM_ACCESS_CATEGORIES_COPY]; |
414 | } __attribute__ ((packed)); | 414 | } __packed; |
415 | 415 | ||
416 | 416 | ||
417 | #endif /* __WL1251_CMD_H__ */ | 417 | #endif /* __WL1251_CMD_H__ */ |