summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-23 10:46:55 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-08-27 09:48:16 -0700
commit47313e340ee6faa43d8ad8a509a00ed1584fb34d (patch)
treeccef408ed10257eb3f23437961affdc13e6ab6d4 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent52a02d1500e4cbb347006e407d1c0bd941eee7fc (diff)
downloadlinux-stable-47313e340ee6faa43d8ad8a509a00ed1584fb34d.tar.gz
linux-stable-47313e340ee6faa43d8ad8a509a00ed1584fb34d.tar.bz2
linux-stable-47313e340ee6faa43d8ad8a509a00ed1584fb34d.zip
iwlwifi: pass context to iwl_send_rxon_timing
Sometimes we need to send RXON timing even when we don't have a virtual interface yet, so pass the context and allow passing one without a virtual interface pointer. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index e81c438b3348..76a45b239664 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3110,7 +3110,7 @@ void iwl3945_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif)
ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwlcore_commit_rxon(priv, ctx);
- rc = iwl_send_rxon_timing(priv, vif);
+ rc = iwl_send_rxon_timing(priv, ctx);
if (rc)
IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
"Attempting to continue.\n");
@@ -3285,7 +3285,7 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif)
iwlcore_commit_rxon(priv, ctx);
/* RXON Timing */
- rc = iwl_send_rxon_timing(priv, vif);
+ rc = iwl_send_rxon_timing(priv, ctx);
if (rc)
IWL_WARN(priv, "REPLY_RXON_TIMING failed - "
"Attempting to continue.\n");