Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 79076
b: refs/heads/master
c: 76bb77e
h: refs/heads/master
v: v3
  • Loading branch information
Zhu Yi authored and David S. Miller committed Jan 28, 2008
1 parent 3b3ae94 commit f7eff40
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a84fd3452d65bd3ec39168ff976f9316f33ab8eb
refs/heads/master: 76bb77e03f5b01fb83fb9fa79febba6e499f948b
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-3945.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ struct iwl3945_priv {
struct ieee80211_hw *hw;
struct ieee80211_channel *ieee_channels;
struct ieee80211_rate *ieee_rates;
struct ieee80211_conf *cache_conf;

/* temporary frame storage list */
struct list_head free_frames;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-4965.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,7 @@ struct iwl4965_priv {
struct ieee80211_hw *hw;
struct ieee80211_channel *ieee_channels;
struct ieee80211_rate *ieee_rates;
struct ieee80211_conf *cache_conf;

/* temporary frame storage list */
struct list_head free_frames;
Expand Down
50 changes: 36 additions & 14 deletions trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6965,6 +6965,8 @@ static void iwl3945_bg_abort_scan(struct work_struct *work)
mutex_unlock(&priv->mutex);
}

static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);

static void iwl3945_bg_scan_completed(struct work_struct *work)
{
struct iwl3945_priv *priv =
Expand All @@ -6975,6 +6977,9 @@ static void iwl3945_bg_scan_completed(struct work_struct *work)
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return;

if (priv->cache_conf)
iwl3945_mac_config(priv->hw, priv->cache_conf);

ieee80211_scan_completed(priv->hw);

/* Since setting the TXPOWER may have been deferred while
Expand Down Expand Up @@ -7104,23 +7109,38 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
struct iwl3945_priv *priv = hw->priv;
const struct iwl3945_channel_info *ch_info;
unsigned long flags;
int ret = 0;

mutex_lock(&priv->mutex);
IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel);

if (!iwl3945_is_ready(priv)) {
IWL_DEBUG_MAC80211("leave - not ready\n");
mutex_unlock(&priv->mutex);
return -EIO;
ret = -EIO;
goto out;
}

/* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only
* what is exposed through include/ declarations */
if (unlikely(!iwl3945_param_disable_hw_scan &&
test_bit(STATUS_SCANNING, &priv->status))) {
IWL_DEBUG_MAC80211("leave - scanning\n");

if (priv->cache_conf)
IWL_DEBUG_MAC80211("leave - still scanning\n");
else {
/* Cache the configuration now so that we can
* replay it after the hardware scan is finished. */
priv->cache_conf = kmalloc(sizeof(*conf), GFP_KERNEL);
if (priv->cache_conf) {
memcpy(priv->cache_conf, conf, sizeof(*conf));
IWL_DEBUG_MAC80211("leave - scanning\n");
} else {
IWL_DEBUG_MAC80211("leave - no memory\n");
ret = -ENOMEM;
}
}
mutex_unlock(&priv->mutex);
return 0;
return ret;
}

spin_lock_irqsave(&priv->lock, flags);
Expand All @@ -7131,8 +7151,8 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
conf->channel, conf->phymode);
IWL_DEBUG_MAC80211("leave - invalid channel\n");
spin_unlock_irqrestore(&priv->lock, flags);
mutex_unlock(&priv->mutex);
return -EINVAL;
ret = -EINVAL;
goto out;
}

iwl3945_set_rxon_channel(priv, conf->phymode, conf->channel);
Expand All @@ -7149,23 +7169,21 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
#ifdef IEEE80211_CONF_CHANNEL_SWITCH
if (conf->flags & IEEE80211_CONF_CHANNEL_SWITCH) {
iwl3945_hw_channel_switch(priv, conf->channel);
mutex_unlock(&priv->mutex);
return 0;
goto out;
}
#endif

iwl3945_radio_kill_sw(priv, !conf->radio_enabled);

if (!conf->radio_enabled) {
IWL_DEBUG_MAC80211("leave - radio disabled\n");
mutex_unlock(&priv->mutex);
return 0;
goto out;
}

if (iwl3945_is_rfkill(priv)) {
IWL_DEBUG_MAC80211("leave - RF kill\n");
mutex_unlock(&priv->mutex);
return -EIO;
ret = -EIO;
goto out;
}

iwl3945_set_rate(priv);
Expand All @@ -7178,9 +7196,13 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co

IWL_DEBUG_MAC80211("leave\n");

out:
if (priv->cache_conf) {
kfree(priv->cache_conf);
priv->cache_conf = NULL;
}
mutex_unlock(&priv->mutex);

return 0;
return ret;
}

static void iwl3945_config_ap(struct iwl3945_priv *priv)
Expand Down
50 changes: 36 additions & 14 deletions trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7403,6 +7403,8 @@ static void iwl4965_bg_abort_scan(struct work_struct *work)
mutex_unlock(&priv->mutex);
}

static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);

static void iwl4965_bg_scan_completed(struct work_struct *work)
{
struct iwl4965_priv *priv =
Expand All @@ -7413,6 +7415,9 @@ static void iwl4965_bg_scan_completed(struct work_struct *work)
if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return;

if (priv->cache_conf)
iwl4965_mac_config(priv->hw, priv->cache_conf);

ieee80211_scan_completed(priv->hw);

/* Since setting the TXPOWER may have been deferred while
Expand Down Expand Up @@ -7541,23 +7546,38 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
struct iwl4965_priv *priv = hw->priv;
const struct iwl4965_channel_info *ch_info;
unsigned long flags;
int ret = 0;

mutex_lock(&priv->mutex);
IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel);

if (!iwl4965_is_ready(priv)) {
IWL_DEBUG_MAC80211("leave - not ready\n");
mutex_unlock(&priv->mutex);
return -EIO;
ret = -EIO;
goto out;
}

/* TODO: Figure out how to get ieee80211_local->sta_scanning w/ only
* what is exposed through include/ declarations */
if (unlikely(!iwl4965_param_disable_hw_scan &&
test_bit(STATUS_SCANNING, &priv->status))) {
IWL_DEBUG_MAC80211("leave - scanning\n");

if (unlikely(priv->cache_conf))
IWL_DEBUG_MAC80211("leave - still scanning\n");
else {
/* Cache the configuration now so that we can
* replay it after the hardware scan is finished. */
priv->cache_conf = kmalloc(sizeof(*conf), GFP_KERNEL);
if (priv->cache_conf) {
memcpy(priv->cache_conf, conf, sizeof(*conf));
IWL_DEBUG_MAC80211("leave - scanning\n");
} else {
IWL_DEBUG_MAC80211("leave - no memory\n");
ret = -ENOMEM;
}
}
mutex_unlock(&priv->mutex);
return 0;
return ret;
}

spin_lock_irqsave(&priv->lock, flags);
Expand All @@ -7568,8 +7588,8 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
conf->channel, conf->phymode);
IWL_DEBUG_MAC80211("leave - invalid channel\n");
spin_unlock_irqrestore(&priv->lock, flags);
mutex_unlock(&priv->mutex);
return -EINVAL;
ret = -EINVAL;
goto out;
}

#ifdef CONFIG_IWL4965_HT
Expand Down Expand Up @@ -7598,23 +7618,21 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co
#ifdef IEEE80211_CONF_CHANNEL_SWITCH
if (conf->flags & IEEE80211_CONF_CHANNEL_SWITCH) {
iwl4965_hw_channel_switch(priv, conf->channel);
mutex_unlock(&priv->mutex);
return 0;
goto out;
}
#endif

iwl4965_radio_kill_sw(priv, !conf->radio_enabled);

if (!conf->radio_enabled) {
IWL_DEBUG_MAC80211("leave - radio disabled\n");
mutex_unlock(&priv->mutex);
return 0;
goto out;
}

if (iwl4965_is_rfkill(priv)) {
IWL_DEBUG_MAC80211("leave - RF kill\n");
mutex_unlock(&priv->mutex);
return -EIO;
ret = -EIO;
goto out;
}

iwl4965_set_rate(priv);
Expand All @@ -7627,9 +7645,13 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co

IWL_DEBUG_MAC80211("leave\n");

out:
if (priv->cache_conf) {
kfree(priv->cache_conf);
priv->cache_conf = NULL;
}
mutex_unlock(&priv->mutex);

return 0;
return ret;
}

static void iwl4965_config_ap(struct iwl4965_priv *priv)
Expand Down

0 comments on commit f7eff40

Please sign in to comment.