diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-04-27 18:43:33 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 15:08:50 -0700 |
| commit | 3d38f1731e3a8217e228fde0a4bfece865bc7901 (patch) | |
| tree | fc28d8f48cca13154db5cedc83e4d5f27f0a57b6 /drivers/net | |
| parent | f401241310f4260505b1c462807c83aac5e5bbc8 (diff) | |
| download | linux-3d38f1731e3a8217e228fde0a4bfece865bc7901.tar.gz linux-3d38f1731e3a8217e228fde0a4bfece865bc7901.tar.bz2 linux-3d38f1731e3a8217e228fde0a4bfece865bc7901.zip | |
iwlwifi: checking for all the possible failure cases
Multiple error condition require fw/rf reset, driver should check all
the possible errors as long as the error checking functions for the
devices are available.
Reported-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 1dff14a67b2c..d661fce000c2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -412,9 +412,11 @@ static void iwl_recover_from_statistics(struct iwl_priv *priv, */ IWL_ERR(priv, "low ack count detected, " "restart firmware\n"); - iwl_force_reset(priv, IWL_FW_RESET); + if (!iwl_force_reset(priv, IWL_FW_RESET)) + return; } - } else if (priv->cfg->ops->lib->check_plcp_health) { + } + if (priv->cfg->ops->lib->check_plcp_health) { if (!priv->cfg->ops->lib->check_plcp_health( priv, pkt)) { /* |