diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-11-10 12:56:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:26:43 -0500 |
commit | ae79d23d0b2c16998e60f49a16dae53521c76a45 (patch) | |
tree | 09af0e450cb44daa707c7ba77735453a9ac96baa /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
parent | 2a21ff446c07b95d08cbb830bd20112f3ee1d76e (diff) |
iwlagn: fix non-5000+ build
When building 4965 without 5000+ there were a
lot of build errors due to functions being used
that weren't even compiled in. To fix this move
some code around and only compile the HCMD code
for 5000+ series as it's not used for 4965.
Signed-off-by: Johannes Berg <johannes.berg@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 | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 11b3d8888360..f0ddfb1a9c87 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |||
@@ -585,3 +585,19 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, | |||
585 | 585 | ||
586 | mutex_unlock(&priv->mutex); | 586 | mutex_unlock(&priv->mutex); |
587 | } | 587 | } |
588 | |||
589 | void iwlagn_post_scan(struct iwl_priv *priv) | ||
590 | { | ||
591 | struct iwl_rxon_context *ctx; | ||
592 | |||
593 | /* | ||
594 | * Since setting the RXON may have been deferred while | ||
595 | * performing the scan, fire one off if needed | ||
596 | */ | ||
597 | for_each_context(priv, ctx) | ||
598 | if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging))) | ||
599 | iwlagn_commit_rxon(priv, ctx); | ||
600 | |||
601 | if (priv->cfg->ops->hcmd->set_pan_params) | ||
602 | priv->cfg->ops->hcmd->set_pan_params(priv); | ||
603 | } | ||