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/iwlwifi/iwl-eeprom.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/iwlwifi/iwl-eeprom.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 95aa202c85e3..5488006491a2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
@@ -118,7 +118,7 @@ enum { | |||
118 | struct iwl_eeprom_channel { | 118 | struct iwl_eeprom_channel { |
119 | u8 flags; /* EEPROM_CHANNEL_* flags copied from EEPROM */ | 119 | u8 flags; /* EEPROM_CHANNEL_* flags copied from EEPROM */ |
120 | s8 max_power_avg; /* max power (dBm) on this chnl, limit 31 */ | 120 | s8 max_power_avg; /* max power (dBm) on this chnl, limit 31 */ |
121 | } __attribute__ ((packed)); | 121 | } __packed; |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * iwl_eeprom_enhanced_txpwr structure | 124 | * iwl_eeprom_enhanced_txpwr structure |
@@ -144,7 +144,7 @@ struct iwl_eeprom_enhanced_txpwr { | |||
144 | s8 reserved; | 144 | s8 reserved; |
145 | s8 mimo2_max; | 145 | s8 mimo2_max; |
146 | s8 mimo3_max; | 146 | s8 mimo3_max; |
147 | } __attribute__ ((packed)); | 147 | } __packed; |
148 | 148 | ||
149 | /* 3945 Specific */ | 149 | /* 3945 Specific */ |
150 | #define EEPROM_3945_EEPROM_VERSION (0x2f) | 150 | #define EEPROM_3945_EEPROM_VERSION (0x2f) |
@@ -312,7 +312,7 @@ struct iwl_eeprom_calib_measure { | |||
312 | u8 gain_idx; /* Index into gain table */ | 312 | u8 gain_idx; /* Index into gain table */ |
313 | u8 actual_pow; /* Measured RF output power, half-dBm */ | 313 | u8 actual_pow; /* Measured RF output power, half-dBm */ |
314 | s8 pa_det; /* Power amp detector level (not used) */ | 314 | s8 pa_det; /* Power amp detector level (not used) */ |
315 | } __attribute__ ((packed)); | 315 | } __packed; |
316 | 316 | ||
317 | 317 | ||
318 | /* | 318 | /* |
@@ -328,7 +328,7 @@ struct iwl_eeprom_calib_ch_info { | |||
328 | struct iwl_eeprom_calib_measure | 328 | struct iwl_eeprom_calib_measure |
329 | measurements[EEPROM_TX_POWER_TX_CHAINS] | 329 | measurements[EEPROM_TX_POWER_TX_CHAINS] |
330 | [EEPROM_TX_POWER_MEASUREMENTS]; | 330 | [EEPROM_TX_POWER_MEASUREMENTS]; |
331 | } __attribute__ ((packed)); | 331 | } __packed; |
332 | 332 | ||
333 | /* | 333 | /* |
334 | * txpower subband info. | 334 | * txpower subband info. |
@@ -345,7 +345,7 @@ struct iwl_eeprom_calib_subband_info { | |||
345 | u8 ch_to; /* channel number of highest channel in subband */ | 345 | u8 ch_to; /* channel number of highest channel in subband */ |
346 | struct iwl_eeprom_calib_ch_info ch1; | 346 | struct iwl_eeprom_calib_ch_info ch1; |
347 | struct iwl_eeprom_calib_ch_info ch2; | 347 | struct iwl_eeprom_calib_ch_info ch2; |
348 | } __attribute__ ((packed)); | 348 | } __packed; |
349 | 349 | ||
350 | 350 | ||
351 | /* | 351 | /* |
@@ -374,7 +374,7 @@ struct iwl_eeprom_calib_info { | |||
374 | __le16 voltage; /* signed */ | 374 | __le16 voltage; /* signed */ |
375 | struct iwl_eeprom_calib_subband_info | 375 | struct iwl_eeprom_calib_subband_info |
376 | band_info[EEPROM_TX_POWER_BANDS]; | 376 | band_info[EEPROM_TX_POWER_BANDS]; |
377 | } __attribute__ ((packed)); | 377 | } __packed; |
378 | 378 | ||
379 | 379 | ||
380 | #define ADDRESS_MSK 0x0000FFFF | 380 | #define ADDRESS_MSK 0x0000FFFF |