diff options
| author | Wey-Yi Guy | 2010-02-19 07:03:06 +0100 |
|---|---|---|
| committer | John W. Linville | 2010-02-19 21:52:50 +0100 |
| commit | 8a472da431998b7357e6dc562e79a3061ed56cad (patch) | |
| tree | aecc7c0220e0ac59edae6d2549da0cfe4e0a3304 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlwifi: indicate calib version for 6050 series (diff) | |
| download | kernel-qcow2-linux-8a472da431998b7357e6dc562e79a3061ed56cad.tar.gz kernel-qcow2-linux-8a472da431998b7357e6dc562e79a3061ed56cad.tar.xz kernel-qcow2-linux-8a472da431998b7357e6dc562e79a3061ed56cad.zip | |
iwlwifi: separated time check for different type of force reset
Use different timing duration check for different type of force reset,
force reset request can come from different source and based on
different reason; one type of reset request should not block other type of
reset request.
Adding structure to keep track of different force reset request.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 52b6beb371fe..c5b724eaf306 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3378,6 +3378,12 @@ static int iwl_init_drv(struct iwl_priv *priv) priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; priv->agg_tids_count = 0; + /* initialize force reset */ + priv->force_reset[IWL_RF_RESET].reset_duration = + IWL_DELAY_NEXT_FORCE_RF_RESET; + priv->force_reset[IWL_FW_RESET].reset_duration = + IWL_DELAY_NEXT_FORCE_FW_RELOAD; + /* Choose which receivers/antennas to use */ if (priv->cfg->ops->hcmd->set_rxon_chain) priv->cfg->ops->hcmd->set_rxon_chain(priv); |