diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-14 01:25:13 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-14 01:25:13 +0400 |
| commit | fae88f7eedae42c955075aec7a0cd27545f81511 (patch) | |
| tree | a14895b1d5d5881dfb9eddb23a2ab270e14dc4a7 /drivers/net/wireless/iwlwifi/iwl-rx.c | |
| parent | 1e2cfeef060fa0270f9a2d66b1218c12c05062e0 (diff) | |
| parent | e300d955debdadf599c36e47eb0bc16f5976215c (diff) | |
| download | linux-fae88f7eedae42c955075aec7a0cd27545f81511.tar.xz | |
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index b437f317b979..79773e353baa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -238,7 +238,7 @@ void iwl_recover_from_statistics(struct iwl_priv *priv, */ IWL_ERR(priv, "low ack count detected, " "restart firmware\n"); - if (!iwl_force_reset(priv, IWL_FW_RESET)) + if (!iwl_force_reset(priv, IWL_FW_RESET, false)) return; } } @@ -249,7 +249,7 @@ void iwl_recover_from_statistics(struct iwl_priv *priv, * high plcp error detected * reset Radio */ - iwl_force_reset(priv, IWL_RF_RESET); + iwl_force_reset(priv, IWL_RF_RESET, false); } } } |