lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: move wowlan bool into priv

Browse Source 
With the new WoWLAN flow into the transport
there no longer is a need for this to be
shared, so move it into priv.

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>
This commit is contained in:
Johannes Berg
2012-03-05 11:24:36 -08:00
committed by John W. Linville
parent 2dd4f9f731
commit 15b86bff99
8 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View File

@@ -1193,7 +1193,7 @@ int iwlagn_suspend(struct iwl_priv *priv,
iwl_trans_stop_device(trans(priv)); iwl_trans_stop_device(trans(priv));
priv->shrd->wowlan = true; priv->wowlan = true;
ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_WOWLAN); ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_WOWLAN);
if (ret) if (ret)

2
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
View File

@@ -586,7 +586,7 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
sizeof(struct iwl_addsta_cmd)); sizeof(struct iwl_addsta_cmd));
send_lq = false; send_lq = false;
if (priv->stations[i].lq) { if (priv->stations[i].lq) {
if (priv->shrd->wowlan) if (priv->wowlan)
iwl_sta_fill_lq(priv, ctx, i, &lq); iwl_sta_fill_lq(priv, ctx, i, &lq);
else else
memcpy(&lq, priv->stations[i].lq, memcpy(&lq, priv->stations[i].lq,

2
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
View File

@@ -126,7 +126,7 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
u8 data_retry_limit; u8 data_retry_limit;
u8 rate_plcp; u8 rate_plcp;
if (priv->shrd->wowlan) { if (priv->wowlan) {
rts_retry_limit = IWLAGN_LOW_RETRY_LIMIT; rts_retry_limit = IWLAGN_LOW_RETRY_LIMIT;
data_retry_limit = IWLAGN_LOW_RETRY_LIMIT; data_retry_limit = IWLAGN_LOW_RETRY_LIMIT;
} else { } else {

4
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -701,7 +701,7 @@ int iwl_alive_start(struct iwl_priv *priv)
/* Configure Tx antenna selection based on H/W config */ /* Configure Tx antenna selection based on H/W config */
iwlagn_send_tx_ant_config(priv, hw_params(priv).valid_tx_ant); iwlagn_send_tx_ant_config(priv, hw_params(priv).valid_tx_ant);
if (iwl_is_associated_ctx(ctx) && !priv->shrd->wowlan) { if (iwl_is_associated_ctx(ctx) && !priv->wowlan) {
struct iwl_rxon_cmd *active_rxon = struct iwl_rxon_cmd *active_rxon =
(struct iwl_rxon_cmd *)&ctx->active; (struct iwl_rxon_cmd *)&ctx->active;
/* apply any changes in staging */ /* apply any changes in staging */
@@ -716,7 +716,7 @@ int iwl_alive_start(struct iwl_priv *priv)
iwlagn_set_rxon_chain(priv, ctx); iwlagn_set_rxon_chain(priv, ctx);
} }
if (!priv->shrd->wowlan) { if (!priv->wowlan) {
/* WoWLAN ucode will not reply in the same way, skip it */ /* WoWLAN ucode will not reply in the same way, skip it */
iwl_reset_run_time_calib(priv); iwl_reset_run_time_calib(priv);
} }

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -787,6 +787,8 @@ struct iwl_priv {
bool new_scan_threshold_behaviour; bool new_scan_threshold_behaviour;
bool wowlan;
/* EEPROM MAC addresses */ /* EEPROM MAC addresses */
struct mac_address addresses[2]; struct mac_address addresses[2];

4
drivers/net/wireless/iwlwifi/iwl-mac80211.c
View File

@@ -418,7 +418,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
goto out; goto out;
error: error:
priv->shrd->wowlan = false; priv->wowlan = false;
iwlagn_prepare_restart(priv); iwlagn_prepare_restart(priv);
ieee80211_restart_hw(priv->hw); ieee80211_restart_hw(priv->hw);
out: out:
@@ -474,7 +474,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
/* we'll clear ctx->vif during iwlagn_prepare_restart() */ /* we'll clear ctx->vif during iwlagn_prepare_restart() */
vif = ctx->vif; vif = ctx->vif;
priv->shrd->wowlan = false; priv->wowlan = false;
device_set_wakeup_enable(trans(priv)->dev, false); device_set_wakeup_enable(trans(priv)->dev, false);

2
drivers/net/wireless/iwlwifi/iwl-power.c
View File

@@ -348,7 +348,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
dtimper = priv->hw->conf.ps_dtim_period ?: 1; dtimper = priv->hw->conf.ps_dtim_period ?: 1;
if (priv->shrd->wowlan) if (priv->wowlan)
iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper); iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper);
else if (!cfg(priv)->base_params->no_idle_support && else if (!cfg(priv)->base_params->no_idle_support &&
priv->hw->conf.flags & IEEE80211_CONF_IDLE) priv->hw->conf.flags & IEEE80211_CONF_IDLE)

1
drivers/net/wireless/iwlwifi/iwl-shared.h
View File

@@ -371,7 +371,6 @@ struct iwl_shared {
u8 ucode_owner; u8 ucode_owner;
u8 cmd_queue; u8 cmd_queue;
unsigned long status; unsigned long status;
bool wowlan;
u8 valid_contexts; u8 valid_contexts;
const struct iwl_cfg *cfg; const struct iwl_cfg *cfg;