diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/lmac.h')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/lmac.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/lmac.h b/drivers/net/wireless/iwmc3200wifi/lmac.h index a855a99e49b8..5ddcdf8c70c0 100644 --- a/drivers/net/wireless/iwmc3200wifi/lmac.h +++ b/drivers/net/wireless/iwmc3200wifi/lmac.h | |||
@@ -43,7 +43,7 @@ struct iwm_lmac_hdr { | |||
43 | u8 id; | 43 | u8 id; |
44 | u8 flags; | 44 | u8 flags; |
45 | __le16 seq_num; | 45 | __le16 seq_num; |
46 | } __attribute__ ((packed)); | 46 | } __packed; |
47 | 47 | ||
48 | /* LMAC commands */ | 48 | /* LMAC commands */ |
49 | #define CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK 0x1 | 49 | #define CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK 0x1 |
@@ -54,23 +54,23 @@ struct iwm_lmac_cal_cfg_elt { | |||
54 | __le32 send_res; /* 1 for sending back results */ | 54 | __le32 send_res; /* 1 for sending back results */ |
55 | __le32 apply_res; /* 1 for applying calibration results to HW */ | 55 | __le32 apply_res; /* 1 for applying calibration results to HW */ |
56 | __le32 reserved; | 56 | __le32 reserved; |
57 | } __attribute__ ((packed)); | 57 | } __packed; |
58 | 58 | ||
59 | struct iwm_lmac_cal_cfg_status { | 59 | struct iwm_lmac_cal_cfg_status { |
60 | struct iwm_lmac_cal_cfg_elt init; | 60 | struct iwm_lmac_cal_cfg_elt init; |
61 | struct iwm_lmac_cal_cfg_elt periodic; | 61 | struct iwm_lmac_cal_cfg_elt periodic; |
62 | __le32 flags; /* CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK */ | 62 | __le32 flags; /* CALIB_CFG_FLAG_SEND_COMPLETE_NTFY_AFTER_MSK */ |
63 | } __attribute__ ((packed)); | 63 | } __packed; |
64 | 64 | ||
65 | struct iwm_lmac_cal_cfg_cmd { | 65 | struct iwm_lmac_cal_cfg_cmd { |
66 | struct iwm_lmac_cal_cfg_status ucode_cfg; | 66 | struct iwm_lmac_cal_cfg_status ucode_cfg; |
67 | struct iwm_lmac_cal_cfg_status driver_cfg; | 67 | struct iwm_lmac_cal_cfg_status driver_cfg; |
68 | __le32 reserved; | 68 | __le32 reserved; |
69 | } __attribute__ ((packed)); | 69 | } __packed; |
70 | 70 | ||
71 | struct iwm_lmac_cal_cfg_resp { | 71 | struct iwm_lmac_cal_cfg_resp { |
72 | __le32 status; | 72 | __le32 status; |
73 | } __attribute__ ((packed)); | 73 | } __packed; |
74 | 74 | ||
75 | #define IWM_CARD_STATE_SW_HW_ENABLED 0x00 | 75 | #define IWM_CARD_STATE_SW_HW_ENABLED 0x00 |
76 | #define IWM_CARD_STATE_HW_DISABLED 0x01 | 76 | #define IWM_CARD_STATE_HW_DISABLED 0x01 |
@@ -80,7 +80,7 @@ struct iwm_lmac_cal_cfg_resp { | |||
80 | 80 | ||
81 | struct iwm_lmac_card_state { | 81 | struct iwm_lmac_card_state { |
82 | __le32 flags; | 82 | __le32 flags; |
83 | } __attribute__ ((packed)); | 83 | } __packed; |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * COEX_PRIORITY_TABLE_CMD | 86 | * COEX_PRIORITY_TABLE_CMD |
@@ -131,7 +131,7 @@ struct coex_event { | |||
131 | u8 win_med_prio; | 131 | u8 win_med_prio; |
132 | u8 reserved; | 132 | u8 reserved; |
133 | u8 flags; | 133 | u8 flags; |
134 | } __attribute__ ((packed)); | 134 | } __packed; |
135 | 135 | ||
136 | #define COEX_FLAGS_STA_TABLE_VALID_MSK 0x1 | 136 | #define COEX_FLAGS_STA_TABLE_VALID_MSK 0x1 |
137 | #define COEX_FLAGS_UNASSOC_WAKEUP_UMASK_MSK 0x4 | 137 | #define COEX_FLAGS_UNASSOC_WAKEUP_UMASK_MSK 0x4 |
@@ -142,7 +142,7 @@ struct iwm_coex_prio_table_cmd { | |||
142 | u8 flags; | 142 | u8 flags; |
143 | u8 reserved[3]; | 143 | u8 reserved[3]; |
144 | struct coex_event sta_prio[COEX_EVENTS_NUM]; | 144 | struct coex_event sta_prio[COEX_EVENTS_NUM]; |
145 | } __attribute__ ((packed)); | 145 | } __packed; |
146 | 146 | ||
147 | /* Coexistence definitions | 147 | /* Coexistence definitions |
148 | * | 148 | * |
@@ -192,7 +192,7 @@ struct iwm_ct_kill_cfg_cmd { | |||
192 | u32 exit_threshold; | 192 | u32 exit_threshold; |
193 | u32 reserved; | 193 | u32 reserved; |
194 | u32 entry_threshold; | 194 | u32 entry_threshold; |
195 | } __attribute__ ((packed)); | 195 | } __packed; |
196 | 196 | ||
197 | 197 | ||
198 | /* LMAC OP CODES */ | 198 | /* LMAC OP CODES */ |
@@ -428,7 +428,7 @@ struct iwm_lmac_calib_hdr { | |||
428 | u8 first_grp; | 428 | u8 first_grp; |
429 | u8 grp_num; | 429 | u8 grp_num; |
430 | u8 all_data_valid; | 430 | u8 all_data_valid; |
431 | } __attribute__ ((packed)); | 431 | } __packed; |
432 | 432 | ||
433 | #define IWM_LMAC_CALIB_FREQ_GROUPS_NR 7 | 433 | #define IWM_LMAC_CALIB_FREQ_GROUPS_NR 7 |
434 | #define IWM_CALIB_FREQ_GROUPS_NR 5 | 434 | #define IWM_CALIB_FREQ_GROUPS_NR 5 |
@@ -437,20 +437,20 @@ struct iwm_lmac_calib_hdr { | |||
437 | struct iwm_calib_rxiq_entry { | 437 | struct iwm_calib_rxiq_entry { |
438 | u16 ptam_postdist_ars; | 438 | u16 ptam_postdist_ars; |
439 | u16 ptam_postdist_arc; | 439 | u16 ptam_postdist_arc; |
440 | } __attribute__ ((packed)); | 440 | } __packed; |
441 | 441 | ||
442 | struct iwm_calib_rxiq_group { | 442 | struct iwm_calib_rxiq_group { |
443 | struct iwm_calib_rxiq_entry mode[IWM_CALIB_DC_MODES_NR]; | 443 | struct iwm_calib_rxiq_entry mode[IWM_CALIB_DC_MODES_NR]; |
444 | } __attribute__ ((packed)); | 444 | } __packed; |
445 | 445 | ||
446 | struct iwm_lmac_calib_rxiq { | 446 | struct iwm_lmac_calib_rxiq { |
447 | struct iwm_calib_rxiq_group group[IWM_LMAC_CALIB_FREQ_GROUPS_NR]; | 447 | struct iwm_calib_rxiq_group group[IWM_LMAC_CALIB_FREQ_GROUPS_NR]; |
448 | } __attribute__ ((packed)); | 448 | } __packed; |
449 | 449 | ||
450 | struct iwm_calib_rxiq { | 450 | struct iwm_calib_rxiq { |
451 | struct iwm_lmac_calib_hdr hdr; | 451 | struct iwm_lmac_calib_hdr hdr; |
452 | struct iwm_calib_rxiq_group group[IWM_CALIB_FREQ_GROUPS_NR]; | 452 | struct iwm_calib_rxiq_group group[IWM_CALIB_FREQ_GROUPS_NR]; |
453 | } __attribute__ ((packed)); | 453 | } __packed; |
454 | 454 | ||
455 | #define LMAC_STA_ID_SEED 0x0f | 455 | #define LMAC_STA_ID_SEED 0x0f |
456 | #define LMAC_STA_ID_POS 0 | 456 | #define LMAC_STA_ID_POS 0 |
@@ -463,7 +463,7 @@ struct iwm_lmac_power_report { | |||
463 | u8 pa_integ_res_A[3]; | 463 | u8 pa_integ_res_A[3]; |
464 | u8 pa_integ_res_B[3]; | 464 | u8 pa_integ_res_B[3]; |
465 | u8 pa_integ_res_C[3]; | 465 | u8 pa_integ_res_C[3]; |
466 | } __attribute__ ((packed)); | 466 | } __packed; |
467 | 467 | ||
468 | struct iwm_lmac_tx_resp { | 468 | struct iwm_lmac_tx_resp { |
469 | u8 frame_cnt; /* 1-no aggregation, greater then 1 - aggregation */ | 469 | u8 frame_cnt; /* 1-no aggregation, greater then 1 - aggregation */ |
@@ -479,6 +479,6 @@ struct iwm_lmac_tx_resp { | |||
479 | u8 ra_tid; | 479 | u8 ra_tid; |
480 | __le16 frame_ctl; | 480 | __le16 frame_ctl; |
481 | __le32 status; | 481 | __le32 status; |
482 | } __attribute__ ((packed)); | 482 | } __packed; |
483 | 483 | ||
484 | #endif | 484 | #endif |