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

mwl8k: get rid of mwl8k_config() workqueue use

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek
2009-07-17 07:19:37 +02:00
committed by John W. Linville
parent d3cea0b85a
commit ee03a93241
1 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/net/wireless/mwl8k.c
View File

@@ -2622,79 +2622,47 @@ static void mwl8k_remove_interface(struct ieee80211_hw *hw,
priv->vif = NULL; priv->vif = NULL;
} }
struct mwl8k_config_worker { static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
struct mwl8k_work_struct header;
u32 changed;
};
static int mwl8k_config_wt(struct work_struct *wt)
{ {
struct mwl8k_config_worker *worker =
(struct mwl8k_config_worker *)wt;
struct ieee80211_hw *hw = worker->header.hw;
struct ieee80211_conf *conf = &hw->conf; struct ieee80211_conf *conf = &hw->conf;
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
int rc = 0; int rc;
if (conf->flags & IEEE80211_CONF_IDLE) { if (conf->flags & IEEE80211_CONF_IDLE) {
mwl8k_cmd_802_11_radio_disable(hw); mwl8k_cmd_802_11_radio_disable(hw);
priv->current_channel = NULL; priv->current_channel = NULL;
goto mwl8k_config_exit; return 0;
} }
if (mwl8k_cmd_802_11_radio_enable(hw)) { rc = mwl8k_fw_lock(hw);
rc = -EINVAL; if (rc)
goto mwl8k_config_exit; return rc;
}
rc = mwl8k_cmd_802_11_radio_enable(hw);
if (rc)
goto out;
rc = mwl8k_cmd_set_rf_channel(hw, conf->channel);
if (rc)
goto out;
priv->current_channel = conf->channel; priv->current_channel = conf->channel;
if (mwl8k_cmd_set_rf_channel(hw, conf->channel)) {
rc = -EINVAL;
goto mwl8k_config_exit;
}
if (conf->power_level > 18) if (conf->power_level > 18)
conf->power_level = 18; conf->power_level = 18;
if (mwl8k_cmd_802_11_rf_tx_power(hw, conf->power_level)) { rc = mwl8k_cmd_802_11_rf_tx_power(hw, conf->power_level);
rc = -EINVAL; if (rc)
goto mwl8k_config_exit; goto out;
}
if (mwl8k_cmd_mimo_config(hw, 0x7, 0x7)) if (mwl8k_cmd_mimo_config(hw, 0x7, 0x7))
rc = -EINVAL; rc = -EINVAL;
mwl8k_config_exit: out:
mwl8k_fw_unlock(hw);
return rc; return rc;
} }
static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
{
int rc = 0;
struct mwl8k_config_worker *worker;
worker = kzalloc(sizeof(*worker), GFP_KERNEL);
if (worker == NULL)
return -ENOMEM;
worker->changed = changed;
rc = mwl8k_queue_work(hw, &worker->header, mwl8k_config_wt);
if (rc == -ETIMEDOUT) {
printk(KERN_ERR "%s() timed out.\n", __func__);
rc = -EINVAL;
}
kfree(worker);
/*
* mac80211 will crash on anything other than -EINVAL on
* error. Looks like wireless extensions which calls mac80211
* may be the actual culprit...
*/
return rc ? -EINVAL : 0;
}
struct mwl8k_bss_info_changed_worker { struct mwl8k_bss_info_changed_worker {
struct mwl8k_work_struct header; struct mwl8k_work_struct header;
struct ieee80211_vif *vif; struct ieee80211_vif *vif;