diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index e0c05feb296c..9f362024a29c 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -598,9 +598,9 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
598 | txq->need_update = 0; | 598 | txq->need_update = 0; |
599 | } | 599 | } |
600 | 600 | ||
601 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x \n", | 601 | IWL_DEBUG_TX(priv, "sequence nr = 0X%x\n", |
602 | le16_to_cpu(out_cmd->hdr.sequence)); | 602 | le16_to_cpu(out_cmd->hdr.sequence)); |
603 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x \n", le32_to_cpu(tx_cmd->tx_flags)); | 603 | IWL_DEBUG_TX(priv, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags)); |
604 | iwl_print_hex_dump(priv, IWL_DL_TX, tx_cmd, sizeof(*tx_cmd)); | 604 | iwl_print_hex_dump(priv, IWL_DL_TX, tx_cmd, sizeof(*tx_cmd)); |
605 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, | 605 | iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, |
606 | ieee80211_hdrlen(fc)); | 606 | ieee80211_hdrlen(fc)); |
@@ -1604,9 +1604,6 @@ static int iwl3945_print_last_event_logs(struct iwl_priv *priv, u32 capacity, | |||
1604 | return pos; | 1604 | return pos; |
1605 | } | 1605 | } |
1606 | 1606 | ||
1607 | /* For sanity check only. Actual size is determined by uCode, typ. 512 */ | ||
1608 | #define IWL3945_MAX_EVENT_LOG_SIZE (512) | ||
1609 | |||
1610 | #define DEFAULT_IWL3945_DUMP_EVENT_LOG_ENTRIES (20) | 1607 | #define DEFAULT_IWL3945_DUMP_EVENT_LOG_ENTRIES (20) |
1611 | 1608 | ||
1612 | int iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log, | 1609 | int iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log, |
@@ -1633,16 +1630,16 @@ int iwl3945_dump_nic_event_log(struct iwl_priv *priv, bool full_log, | |||
1633 | num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32))); | 1630 | num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32))); |
1634 | next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32))); | 1631 | next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32))); |
1635 | 1632 | ||
1636 | if (capacity > IWL3945_MAX_EVENT_LOG_SIZE) { | 1633 | if (capacity > priv->cfg->max_event_log_size) { |
1637 | IWL_ERR(priv, "Log capacity %d is bogus, limit to %d entries\n", | 1634 | IWL_ERR(priv, "Log capacity %d is bogus, limit to %d entries\n", |
1638 | capacity, IWL3945_MAX_EVENT_LOG_SIZE); | 1635 | capacity, priv->cfg->max_event_log_size); |
1639 | capacity = IWL3945_MAX_EVENT_LOG_SIZE; | 1636 | capacity = priv->cfg->max_event_log_size; |
1640 | } | 1637 | } |
1641 | 1638 | ||
1642 | if (next_entry > IWL3945_MAX_EVENT_LOG_SIZE) { | 1639 | if (next_entry > priv->cfg->max_event_log_size) { |
1643 | IWL_ERR(priv, "Log write index %d is bogus, limit to %d\n", | 1640 | IWL_ERR(priv, "Log write index %d is bogus, limit to %d\n", |
1644 | next_entry, IWL3945_MAX_EVENT_LOG_SIZE); | 1641 | next_entry, priv->cfg->max_event_log_size); |
1645 | next_entry = IWL3945_MAX_EVENT_LOG_SIZE; | 1642 | next_entry = priv->cfg->max_event_log_size; |
1646 | } | 1643 | } |
1647 | 1644 | ||
1648 | size = num_wraps ? capacity : next_entry; | 1645 | size = num_wraps ? capacity : next_entry; |
@@ -1938,7 +1935,7 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv, | |||
1938 | added++; | 1935 | added++; |
1939 | } | 1936 | } |
1940 | 1937 | ||
1941 | IWL_DEBUG_SCAN(priv, "total channels to scan %d \n", added); | 1938 | IWL_DEBUG_SCAN(priv, "total channels to scan %d\n", added); |
1942 | return added; | 1939 | return added; |
1943 | } | 1940 | } |
1944 | 1941 | ||
@@ -3141,8 +3138,6 @@ void iwl3945_post_associate(struct iwl_priv *priv) | |||
3141 | break; | 3138 | break; |
3142 | } | 3139 | } |
3143 | 3140 | ||
3144 | iwl_activate_qos(priv, 0); | ||
3145 | |||
3146 | /* we have just associated, don't start scan too early */ | 3141 | /* we have just associated, don't start scan too early */ |
3147 | priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; | 3142 | priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; |
3148 | } | 3143 | } |
@@ -3404,7 +3399,7 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw, | |||
3404 | } | 3399 | } |
3405 | 3400 | ||
3406 | /* Initialize rate scaling */ | 3401 | /* Initialize rate scaling */ |
3407 | IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM \n", | 3402 | IWL_DEBUG_INFO(priv, "Initializing rate scaling for station %pM\n", |
3408 | sta->addr); | 3403 | sta->addr); |
3409 | iwl3945_rs_rate_init(priv, sta, sta_id); | 3404 | iwl3945_rs_rate_init(priv, sta, sta_id); |
3410 | 3405 | ||
@@ -3890,11 +3885,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv) | |||
3890 | priv->iw_mode = NL80211_IFTYPE_STATION; | 3885 | priv->iw_mode = NL80211_IFTYPE_STATION; |
3891 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; | 3886 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; |
3892 | 3887 | ||
3893 | iwl_reset_qos(priv); | ||
3894 | |||
3895 | priv->qos_data.qos_active = 0; | ||
3896 | priv->qos_data.qos_cap.val = 0; | ||
3897 | |||
3898 | priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER; | 3888 | priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER; |
3899 | 3889 | ||
3900 | if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { | 3890 | if (eeprom->version < EEPROM_3945_EEPROM_VERSION) { |