iwlwifi: allow config if device not ready
authorMohamed Abbas <mohamed.abbas@intel.com>
Mon, 20 Apr 2009 21:37:04 +0000 (14:37 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Apr 2009 20:57:19 +0000 (16:57 -0400)
Allow user to config the device all the time but only allow commiting
these changes to card if the card is up and running.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-core.c

index bf7ad515e6a0333bba46c9505bc5e5091cb39411..3dec2d25fa3d9f351ee134c1338241934bf87e25 100644 (file)
@@ -2474,12 +2474,6 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
 
        mutex_lock(&priv->mutex);
 
-       if (!iwl_is_ready(priv)) {
-               IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
-               ret = -EIO;
-               goto out;
-       }
-
        IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",
                                        conf->channel->hw_value, changed);
 
@@ -2574,6 +2568,11 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
                goto out;
        }
 
+       if (!iwl_is_ready(priv)) {
+               IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
+               goto out;
+       }
+
        if (scan_active)
                goto out;