Commit 019fb97d authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville

iwlagn: use changed in mac_config

In function iwl_mac_config use changed flag to call only
the affected functions. This patch also allow user to cache
channel, txpower and power value when the interface is not
ready and apply the changes once the interface ready.
Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b85875a
...@@ -1567,9 +1567,8 @@ static void iwl_alive_start(struct iwl_priv *priv) ...@@ -1567,9 +1567,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
if (iwl_is_associated(priv)) { if (iwl_is_associated(priv)) {
struct iwl_rxon_cmd *active_rxon = struct iwl_rxon_cmd *active_rxon =
(struct iwl_rxon_cmd *)&priv->active_rxon; (struct iwl_rxon_cmd *)&priv->active_rxon;
/* apply any changes in staging */
memcpy(&priv->staging_rxon, &priv->active_rxon, priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
sizeof(priv->staging_rxon));
active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK; active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
} else { } else {
/* Initialize our rx_config data */ /* Initialize our rx_config data */
...@@ -2184,110 +2183,112 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) ...@@ -2184,110 +2183,112 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
struct iwl_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
const struct iwl_channel_info *ch_info; const struct iwl_channel_info *ch_info;
struct ieee80211_conf *conf = &hw->conf; struct ieee80211_conf *conf = &hw->conf;
unsigned long flags; unsigned long flags = 0;
int ret = 0; int ret = 0;
u16 channel; u16 ch;
int scan_active = 0;
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
IWL_DEBUG_MAC80211(priv, "enter to channel %d\n", conf->channel->hw_value); IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",
conf->channel->hw_value, changed);
priv->current_ht_config.is_ht = conf_is_ht(conf);
if (conf->radio_enabled && iwl_radio_kill_sw_enable_radio(priv)) { if (unlikely(!priv->cfg->mod_params->disable_hw_scan &&
IWL_DEBUG_MAC80211(priv, "leave - RF-KILL - waiting for uCode\n"); test_bit(STATUS_SCANNING, &priv->status))) {
goto out; scan_active = 1;
IWL_DEBUG_MAC80211(priv, "leave - scanning\n");
} }
if (!conf->radio_enabled)
iwl_radio_kill_sw_disable_radio(priv);
if (!iwl_is_ready(priv)) { /* during scanning mac80211 will delay channel setting until
IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); * scan finish with changed = 0
ret = -EIO; */
goto out; if (!changed || (changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
} if (scan_active)
goto set_ch_out;
ch = ieee80211_frequency_to_channel(conf->channel->center_freq);
ch_info = iwl_get_channel_info(priv, conf->channel->band, ch);
if (!is_channel_valid(ch_info)) {
IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
ret = -EINVAL;
goto set_ch_out;
}
if (unlikely(!priv->cfg->mod_params->disable_hw_scan && if (priv->iw_mode == NL80211_IFTYPE_ADHOC &&
test_bit(STATUS_SCANNING, &priv->status))) { !is_channel_ibss(ch_info)) {
IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); IWL_ERR(priv, "channel %d in band %d not "
mutex_unlock(&priv->mutex); "IBSS channel\n",
return 0; conf->channel->hw_value, conf->channel->band);
} ret = -EINVAL;
goto set_ch_out;
}
channel = ieee80211_frequency_to_channel(conf->channel->center_freq); priv->current_ht_config.is_ht = conf_is_ht(conf);
ch_info = iwl_get_channel_info(priv, conf->channel->band, channel);
if (!is_channel_valid(ch_info)) {
IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
ret = -EINVAL;
goto out;
}
if (priv->iw_mode == NL80211_IFTYPE_ADHOC && spin_lock_irqsave(&priv->lock, flags);
!is_channel_ibss(ch_info)) {
IWL_ERR(priv, "channel %d in band %d not IBSS channel\n",
conf->channel->hw_value, conf->channel->band);
ret = -EINVAL;
goto out;
}
spin_lock_irqsave(&priv->lock, flags);
/* if we are switching from ht to 2.4 clear flags
* from any ht related info since 2.4 does not
* support ht */
if ((le16_to_cpu(priv->staging_rxon.channel) != ch))
priv->staging_rxon.flags = 0;
/* if we are switching from ht to 2.4 clear flags iwl_set_rxon_channel(priv, conf->channel);
* from any ht related info since 2.4 does not
* support ht */ iwl_set_flags_for_band(priv, conf->channel->band);
if ((le16_to_cpu(priv->staging_rxon.channel) != channel) spin_unlock_irqrestore(&priv->lock, flags);
#ifdef IEEE80211_CONF_CHANNEL_SWITCH set_ch_out:
&& !(conf->flags & IEEE80211_CONF_CHANNEL_SWITCH) /* The list of supported rates and rate mask can be different
#endif * for each band; since the band may have changed, reset
) * the rate mask to what mac80211 lists */
priv->staging_rxon.flags = 0; iwl_set_rate(priv);
}
iwl_set_rxon_channel(priv, conf->channel); if (changed & IEEE80211_CONF_CHANGE_PS) {
if (conf->flags & IEEE80211_CONF_PS)
ret = iwl_power_set_user_mode(priv, IWL_POWER_INDEX_3);
else
ret = iwl_power_set_user_mode(priv, IWL_POWER_MODE_CAM);
if (ret)
IWL_DEBUG_MAC80211(priv, "Error setting power level\n");
iwl_set_flags_for_band(priv, conf->channel->band); }
/* The list of supported rates and rate mask can be different if (changed & IEEE80211_CONF_CHANGE_POWER) {
* for each band; since the band may have changed, reset IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",
* the rate mask to what mac80211 lists */ priv->tx_power_user_lmt, conf->power_level);
iwl_set_rate(priv);
spin_unlock_irqrestore(&priv->lock, flags); iwl_set_tx_power(priv, conf->power_level, false);
}
#ifdef IEEE80211_CONF_CHANNEL_SWITCH /* call to ensure that 4965 rx_chain is set properly in monitor mode */
if (conf->flags & IEEE80211_CONF_CHANNEL_SWITCH) { iwl_set_rxon_chain(priv);
iwl_hw_channel_switch(priv, conf->channel);
goto out; if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED) {
if (conf->radio_enabled &&
iwl_radio_kill_sw_enable_radio(priv)) {
IWL_DEBUG_MAC80211(priv, "leave - RF-KILL - "
"waiting for uCode\n");
goto out;
}
if (!conf->radio_enabled)
iwl_radio_kill_sw_disable_radio(priv);
} }
#endif
if (!conf->radio_enabled) { if (!conf->radio_enabled) {
IWL_DEBUG_MAC80211(priv, "leave - radio disabled\n"); IWL_DEBUG_MAC80211(priv, "leave - radio disabled\n");
goto out; goto out;
} }
if (iwl_is_rfkill(priv)) { if (!iwl_is_ready(priv)) {
IWL_DEBUG_MAC80211(priv, "leave - RF kill\n"); IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
ret = -EIO;
goto out; goto out;
} }
if (conf->flags & IEEE80211_CONF_PS) if (scan_active)
ret = iwl_power_set_user_mode(priv, IWL_POWER_INDEX_3); goto out;
else
ret = iwl_power_set_user_mode(priv, IWL_POWER_MODE_CAM);
if (ret)
IWL_DEBUG_MAC80211(priv, "Error setting power level\n");
IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",
priv->tx_power_user_lmt, conf->power_level);
iwl_set_tx_power(priv, conf->power_level, false);
iwl_set_rate(priv);
/* call to ensure that 4965 rx_chain is set properly in monitor mode */
iwl_set_rxon_chain(priv);
if (memcmp(&priv->active_rxon, if (memcmp(&priv->active_rxon,
&priv->staging_rxon, sizeof(priv->staging_rxon))) &priv->staging_rxon, sizeof(priv->staging_rxon)))
...@@ -2295,9 +2296,9 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) ...@@ -2295,9 +2296,9 @@ static int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
else else
IWL_DEBUG_INFO(priv, "No re-sending same RXON configuration.\n"); IWL_DEBUG_INFO(priv, "No re-sending same RXON configuration.\n");
IWL_DEBUG_MAC80211(priv, "leave\n");
out: out:
IWL_DEBUG_MAC80211(priv, "leave\n");
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
return ret; return ret;
} }
......
...@@ -1437,6 +1437,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) ...@@ -1437,6 +1437,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
priv->tx_power_user_lmt = tx_power; priv->tx_power_user_lmt = tx_power;
/* if nic is not up don't send command */
if (!iwl_is_ready_rf(priv))
return ret;
if (force && priv->cfg->ops->lib->send_tx_power) if (force && priv->cfg->ops->lib->send_tx_power)
ret = priv->cfg->ops->lib->send_tx_power(priv); ret = priv->cfg->ops->lib->send_tx_power(priv);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment