diff options
author | David S. Miller <davem@davemloft.net> | 2010-05-17 21:09:11 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-17 21:09:11 -0700 |
commit | 820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch) | |
tree | 6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/iwlwifi/iwl-rx.c | |
parent | 380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff) | |
parent | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff) | |
download | op-kernel-dev-820ae8a80eb59962aefbbd4908dfe144ec0f9edb.zip op-kernel-dev-820ae8a80eb59962aefbbd4908dfe144ec0f9edb.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-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 267eb89..0a5d7cf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -398,7 +398,7 @@ bool iwl_good_plcp_health(struct iwl_priv *priv, } EXPORT_SYMBOL(iwl_good_plcp_health); -static void iwl_recover_from_statistics(struct iwl_priv *priv, +void iwl_recover_from_statistics(struct iwl_priv *priv, struct iwl_rx_packet *pkt) { if (test_bit(STATUS_EXIT_PENDING, &priv->status)) @@ -413,9 +413,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)) { /* @@ -427,6 +429,7 @@ static void iwl_recover_from_statistics(struct iwl_priv *priv, } } } +EXPORT_SYMBOL(iwl_recover_from_statistics); void iwl_rx_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) |