From: Reinette Chatre <[email protected]>
This hunk of code was removed in patch "iwlwifi: do not
cancel delayed work inside spin_lock_irqsave" submitted at
http://marc.info/?l=linux-wireless&m=124267503030042&w=2
This same patch in this repo does not remove this hunk.
Remove it here.
Signed-off-by: Reinette Chatre <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-core.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index e93ddb7..a9da06f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2685,13 +2685,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
if (!iwl_is_ready_rf(priv))
return -EAGAIN;
- cancel_delayed_work(&priv->scan_check);
- if (iwl_scan_cancel_timeout(priv, 100)) {
- IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
- IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
- return -EAGAIN;
- }
-
iwlcore_commit_rxon(priv);
return 0;
--
1.5.6.3
Hi John,
On Fri, 2009-05-22 at 14:37 -0700, Chatre, Reinette wrote:
> From: Reinette Chatre <[email protected]>
>
> This hunk of code was removed in patch "iwlwifi: do not
> cancel delayed work inside spin_lock_irqsave" submitted at
> http://marc.info/?l=linux-wireless&m=124267503030042&w=2
>
> This same patch in this repo does not remove this hunk.
> Remove it here.
>
The above link is to the patch against 2.6.30 that you fixed for us. I
tried to find the original patches we sent against 2.6.30 and
wireless-testing, but could not find them in the mail archives. The
original patch against wireless-testing also removes this hunk. I do not
know why I cannot find it in the archives.
Reinette
From: Reinette Chatre <[email protected]>
Polling function returns positive time if polling was needed to
read value. This is still success.
Signed-off-by: Reinette Chatre <[email protected]>
CC: Wey-Yi Guy <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index cefa501..7d7554a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -240,13 +240,11 @@ static int iwl_init_otp_access(struct iwl_priv *priv)
if (ret < 0)
IWL_ERR(priv, "Time out access OTP\n");
else {
- if (!ret) {
- iwl_set_bits_prph(priv, APMG_PS_CTRL_REG,
- APMG_PS_CTRL_VAL_RESET_REQ);
- udelay(5);
- iwl_clear_bits_prph(priv, APMG_PS_CTRL_REG,
- APMG_PS_CTRL_VAL_RESET_REQ);
- }
+ iwl_set_bits_prph(priv, APMG_PS_CTRL_REG,
+ APMG_PS_CTRL_VAL_RESET_REQ);
+ udelay(5);
+ iwl_clear_bits_prph(priv, APMG_PS_CTRL_REG,
+ APMG_PS_CTRL_VAL_RESET_REQ);
}
return ret;
}
--
1.5.6.3