diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-14 10:52:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-14 10:52:54 -0800 |
commit | 6389aa73ab8c15084fce18307a8e198eaff818da (patch) | |
tree | cbad535e69b662cbb904afeacf4b50461e415b86 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be (diff) | |
parent | 1d212aa96e1b63459486f729af9a3fa38768b801 (diff) | |
download | op-kernel-dev-6389aa73ab8c15084fce18307a8e198eaff818da.zip op-kernel-dev-6389aa73ab8c15084fce18307a8e198eaff818da.tar.gz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 6788ceb..3f1e5f1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2198,6 +2198,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, return; } + txq->time_stamp = jiffies; info = IEEE80211_SKB_CB(txq->txb[txq->q.read_ptr].skb); memset(&info->status, 0, sizeof(info->status)); @@ -2554,7 +2555,6 @@ static struct iwl_lib_ops iwl4965_lib = { .bt_stats_read = iwl_ucode_bt_stats_read, .reply_tx_error = iwl_reply_tx_error_read, }, - .recover_from_tx_stall = iwl_bg_monitor_recover, .check_plcp_health = iwl_good_plcp_health, }; @@ -2609,7 +2609,7 @@ static struct iwl_base_params iwl4965_base_params = { .led_compensation = 61, .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS, .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, - .monitor_recover_period = IWL_DEF_MONITORING_PERIOD, + .wd_timeout = IWL_DEF_WD_TIMEOUT, .temperature_kelvin = true, .max_event_log_size = 512, .tx_power_by_driver = true, |