diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-08 17:29:48 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 10:29:03 -0400 |
commit | 2e27799621f9b6dc69d9fac5e365cb867eac539c (patch) | |
tree | 500599583a44c485aae95518e187f171d59896f6 /drivers/net | |
parent | ad3f71244c93412087ae93aabce39c4a9fb12891 (diff) |
iwlagn: radio sensor offset in le16 format
For temperature offset calibration, send radio sensor offset in le16 format
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c index f5f5f06b7781..667cfb7002d0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | |||
@@ -167,12 +167,12 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv) | |||
167 | 167 | ||
168 | memset(&cmd, 0, sizeof(cmd)); | 168 | memset(&cmd, 0, sizeof(cmd)); |
169 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); | 169 | iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD); |
170 | cmd.radio_sensor_offset = le16_to_cpu(offset_calib[1]); | 170 | memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(offset_calib)); |
171 | if (!(cmd.radio_sensor_offset)) | 171 | if (!(cmd.radio_sensor_offset)) |
172 | cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET; | 172 | cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET; |
173 | 173 | ||
174 | IWL_DEBUG_CALIB(priv, "Radio sensor offset: %d\n", | 174 | IWL_DEBUG_CALIB(priv, "Radio sensor offset: %d\n", |
175 | cmd.radio_sensor_offset); | 175 | le16_to_cpu(cmd.radio_sensor_offset)); |
176 | return iwl_calib_set(&priv->calib_results[IWL_CALIB_TEMP_OFFSET], | 176 | return iwl_calib_set(&priv->calib_results[IWL_CALIB_TEMP_OFFSET], |
177 | (u8 *)&cmd, sizeof(cmd)); | 177 | (u8 *)&cmd, sizeof(cmd)); |
178 | } | 178 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index d7f20c84eea0..80174d1ca7c2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -3237,11 +3237,11 @@ struct iwl_calib_xtal_freq_cmd { | |||
3237 | u8 pad[2]; | 3237 | u8 pad[2]; |
3238 | } __packed; | 3238 | } __packed; |
3239 | 3239 | ||
3240 | #define DEFAULT_RADIO_SENSOR_OFFSET 2700 | 3240 | #define DEFAULT_RADIO_SENSOR_OFFSET cpu_to_le16(2700) |
3241 | struct iwl_calib_temperature_offset_cmd { | 3241 | struct iwl_calib_temperature_offset_cmd { |
3242 | struct iwl_calib_hdr hdr; | 3242 | struct iwl_calib_hdr hdr; |
3243 | s16 radio_sensor_offset; | 3243 | __le16 radio_sensor_offset; |
3244 | s16 reserved; | 3244 | __le16 reserved; |
3245 | } __packed; | 3245 | } __packed; |
3246 | 3246 | ||
3247 | /* IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD */ | 3247 | /* IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD */ |