diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-26 02:11:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:25:35 -0400 |
commit | 845a9c0d8acea87dede740bc5feb9ec2d00505d9 (patch) | |
tree | e158e899b61d5e5b92c50e905a258d857015c764 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
parent | effcea16e554b4d7497bbcfc80b9baca8e017691 (diff) |
iwlagn: move all iwl_is_XXX helpers to iwl-shared.h
Logic move after all priv->status moved to struct iwl_shared
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 991977e2e1b0..7ce56ff4a525 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |||
@@ -426,7 +426,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) | |||
426 | if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status)) | 426 | if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status)) |
427 | return -EINVAL; | 427 | return -EINVAL; |
428 | 428 | ||
429 | if (!iwl_is_alive(priv)) | 429 | if (!iwl_is_alive(priv->shrd)) |
430 | return -EBUSY; | 430 | return -EBUSY; |
431 | 431 | ||
432 | /* This function hardcodes a bunch of dual-mode assumptions */ | 432 | /* This function hardcodes a bunch of dual-mode assumptions */ |
@@ -544,7 +544,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) | |||
544 | goto out; | 544 | goto out; |
545 | } | 545 | } |
546 | 546 | ||
547 | if (!iwl_is_ready(priv)) { | 547 | if (!iwl_is_ready(priv->shrd)) { |
548 | IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); | 548 | IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); |
549 | goto out; | 549 | goto out; |
550 | } | 550 | } |
@@ -794,7 +794,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, | |||
794 | 794 | ||
795 | mutex_lock(&priv->shrd->mutex); | 795 | mutex_lock(&priv->shrd->mutex); |
796 | 796 | ||
797 | if (unlikely(!iwl_is_ready(priv))) { | 797 | if (unlikely(!iwl_is_ready(priv->shrd))) { |
798 | IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); | 798 | IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); |
799 | mutex_unlock(&priv->shrd->mutex); | 799 | mutex_unlock(&priv->shrd->mutex); |
800 | return; | 800 | return; |