diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-02-17 04:54:08 -0800 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 16:06:06 -0800 |
| commit | b55e75ed926ded110293b0d1e24eb6a878883115 (patch) | |
| tree | 8d8d8661b7e8044e89677d4c7c2f6d92451239c5 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | 76c9cc18fd2c8cfa5a7f66d5496d469db00eaf54 (diff) | |
| download | kernel_samsung_aries-b55e75ed926ded110293b0d1e24eb6a878883115.zip kernel_samsung_aries-b55e75ed926ded110293b0d1e24eb6a878883115.tar.gz kernel_samsung_aries-b55e75ed926ded110293b0d1e24eb6a878883115.tar.bz2 | |
iwlwifi: remove STATUS_MODE_PENDING
Since rfkill integration, mac80211 can no
longer add an interface while the hardware
is not ready, so STATUS_MODE_PENDING can
never be set.
Also, remove another superfluous channel
sanity check and return the commit_rxon
return value in case it failed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index bdd5fc7..2fd1b3d 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -2537,9 +2537,6 @@ static void iwl3945_alive_start(struct iwl_priv *priv) set_bit(STATUS_READY, &priv->status); wake_up_interruptible(&priv->wait_command_queue); - if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status)) - iwl_set_mode(priv, priv->iw_mode); - return; restart: |