diff options
| author | Arve Hjønnevåg <arve@android.com> | 2010-03-10 16:38:33 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2010-03-10 16:38:33 -0800 |
| commit | 67078ecae3edb5b4657dcb9f67f744ecccd18a97 (patch) | |
| tree | 90333318a7229fd977881577e0d19fd8e7e26423 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | dc136618cb23810dd3d4adfcb836b289cd528b4f (diff) | |
| parent | 7f5e918e62cbc9ac27c2f47d3c3dd4b86f67ff0e (diff) | |
Merge commit 'v2.6.32.9' into android-2.6.32
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 6f703a041847..99331edd9d75 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -1337,7 +1337,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel, iwl4965_interpolate_chan(priv, channel, &ch_eeprom_info); /* calculate tx gain adjustment based on power supply voltage */ - voltage = priv->calib_info->voltage; + voltage = le16_to_cpu(priv->calib_info->voltage); init_voltage = (s32)le32_to_cpu(priv->card_alive_init.voltage); voltage_compensation = iwl4965_get_voltage_compensation(voltage, init_voltage); @@ -2087,7 +2087,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, struct ieee80211_tx_info *info; struct iwl4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; u32 status = le32_to_cpu(tx_resp->u.status); - int tid = MAX_TID_COUNT; + int tid = MAX_TID_COUNT - 1; int sta_id; int freed; u8 *qc = NULL; |