diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index db148d05af1a..64eb049140dc 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -2547,7 +2547,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv) | |||
2547 | priv->cfg->ops->hcmd->send_bt_config(priv); | 2547 | priv->cfg->ops->hcmd->send_bt_config(priv); |
2548 | 2548 | ||
2549 | /* Configure the adapter for unassociated operation */ | 2549 | /* Configure the adapter for unassociated operation */ |
2550 | iwlcore_commit_rxon(priv, ctx); | 2550 | iwl3945_commit_rxon(priv, ctx); |
2551 | 2551 | ||
2552 | iwl3945_reg_txpower_periodic(priv); | 2552 | iwl3945_reg_txpower_periodic(priv); |
2553 | 2553 | ||
@@ -2992,7 +2992,7 @@ void iwl3945_post_scan(struct iwl_priv *priv) | |||
2992 | * performing the scan, fire one off if needed | 2992 | * performing the scan, fire one off if needed |
2993 | */ | 2993 | */ |
2994 | if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging))) | 2994 | if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging))) |
2995 | iwlcore_commit_rxon(priv, ctx); | 2995 | iwl3945_commit_rxon(priv, ctx); |
2996 | } | 2996 | } |
2997 | 2997 | ||
2998 | static void iwl3945_bg_restart(struct work_struct *data) | 2998 | static void iwl3945_bg_restart(struct work_struct *data) |
@@ -3061,7 +3061,7 @@ void iwl3945_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
3061 | conf = ieee80211_get_hw_conf(priv->hw); | 3061 | conf = ieee80211_get_hw_conf(priv->hw); |
3062 | 3062 | ||
3063 | ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK; | 3063 | ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK; |
3064 | iwlcore_commit_rxon(priv, ctx); | 3064 | iwl3945_commit_rxon(priv, ctx); |
3065 | 3065 | ||
3066 | rc = iwl_send_rxon_timing(priv, ctx); | 3066 | rc = iwl_send_rxon_timing(priv, ctx); |
3067 | if (rc) | 3067 | if (rc) |
@@ -3087,7 +3087,7 @@ void iwl3945_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
3087 | ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK; | 3087 | ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK; |
3088 | } | 3088 | } |
3089 | 3089 | ||
3090 | iwlcore_commit_rxon(priv, ctx); | 3090 | iwl3945_commit_rxon(priv, ctx); |
3091 | 3091 | ||
3092 | switch (vif->type) { | 3092 | switch (vif->type) { |
3093 | case NL80211_IFTYPE_STATION: | 3093 | case NL80211_IFTYPE_STATION: |
@@ -3226,7 +3226,7 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
3226 | 3226 | ||
3227 | /* RXON - unassoc (to set timing command) */ | 3227 | /* RXON - unassoc (to set timing command) */ |
3228 | ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK; | 3228 | ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK; |
3229 | iwlcore_commit_rxon(priv, ctx); | 3229 | iwl3945_commit_rxon(priv, ctx); |
3230 | 3230 | ||
3231 | /* RXON Timing */ | 3231 | /* RXON Timing */ |
3232 | rc = iwl_send_rxon_timing(priv, ctx); | 3232 | rc = iwl_send_rxon_timing(priv, ctx); |
@@ -3253,7 +3253,7 @@ void iwl3945_config_ap(struct iwl_priv *priv, struct ieee80211_vif *vif) | |||
3253 | } | 3253 | } |
3254 | /* restore RXON assoc */ | 3254 | /* restore RXON assoc */ |
3255 | ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; | 3255 | ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; |
3256 | iwlcore_commit_rxon(priv, ctx); | 3256 | iwl3945_commit_rxon(priv, ctx); |
3257 | } | 3257 | } |
3258 | iwl3945_send_beacon_cmd(priv); | 3258 | iwl3945_send_beacon_cmd(priv); |
3259 | 3259 | ||
@@ -3519,7 +3519,7 @@ static ssize_t store_flags(struct device *d, | |||
3519 | IWL_DEBUG_INFO(priv, "Committing rxon.flags = 0x%04X\n", | 3519 | IWL_DEBUG_INFO(priv, "Committing rxon.flags = 0x%04X\n", |
3520 | flags); | 3520 | flags); |
3521 | ctx->staging.flags = cpu_to_le32(flags); | 3521 | ctx->staging.flags = cpu_to_le32(flags); |
3522 | iwlcore_commit_rxon(priv, ctx); | 3522 | iwl3945_commit_rxon(priv, ctx); |
3523 | } | 3523 | } |
3524 | } | 3524 | } |
3525 | mutex_unlock(&priv->mutex); | 3525 | mutex_unlock(&priv->mutex); |
@@ -3557,7 +3557,7 @@ static ssize_t store_filter_flags(struct device *d, | |||
3557 | "0x%04X\n", filter_flags); | 3557 | "0x%04X\n", filter_flags); |
3558 | ctx->staging.filter_flags = | 3558 | ctx->staging.filter_flags = |
3559 | cpu_to_le32(filter_flags); | 3559 | cpu_to_le32(filter_flags); |
3560 | iwlcore_commit_rxon(priv, ctx); | 3560 | iwl3945_commit_rxon(priv, ctx); |
3561 | } | 3561 | } |
3562 | } | 3562 | } |
3563 | mutex_unlock(&priv->mutex); | 3563 | mutex_unlock(&priv->mutex); |