diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-09-22 12:01:56 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-10-07 18:49:05 -0400 |
commit | a77029ee3fc03a37238b73892e55b789273991aa (patch) | |
tree | 0a2047affc7e246962b38e2dab21d7e1fb8a0da9 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 7314c2b377afaf367f2966bd9ea67bf83350e29b (diff) |
iwlwifi: introduce post_scan hook
The different drivers need to do different things
after a scan, so create a post_scan hook to allow
them to do this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 43db5f38e3e6..db148d05af1a 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -2983,6 +2983,18 @@ int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
2983 | return ret; | 2983 | return ret; |
2984 | } | 2984 | } |
2985 | 2985 | ||
2986 | void iwl3945_post_scan(struct iwl_priv *priv) | ||
2987 | { | ||
2988 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | ||
2989 | |||
2990 | /* | ||
2991 | * Since setting the RXON may have been deferred while | ||
2992 | * performing the scan, fire one off if needed | ||
2993 | */ | ||
2994 | if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging))) | ||
2995 | iwlcore_commit_rxon(priv, ctx); | ||
2996 | } | ||
2997 | |||
2986 | static void iwl3945_bg_restart(struct work_struct *data) | 2998 | static void iwl3945_bg_restart(struct work_struct *data) |
2987 | { | 2999 | { |
2988 | struct iwl_priv *priv = container_of(data, struct iwl_priv, restart); | 3000 | struct iwl_priv *priv = container_of(data, struct iwl_priv, restart); |