mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

mwl8k: remove MWL8K_WMM_* defines

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-16 12:34:02 +02:00 committed by John W. Linville
parent 68ce38845c
commit 0439b1f556
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/wireless/mwl8k.c
View file

@ -188,9 +188,7 @@ struct mwl8k_priv {
bool radio_on; bool radio_on;
bool radio_short_preamble; bool radio_short_preamble;
bool wmm_enabled;
/* WMM MODE 1 for enabled; 0 for disabled */
bool wmm_mode;
/* Set if PHY config is in progress */ /* Set if PHY config is in progress */
bool inconfig; bool inconfig;
@ -276,10 +274,6 @@ static const struct ieee80211_rate mwl8k_rates[] = {
{ .bitrate = 540, .hw_value = 108, }, { .bitrate = 540, .hw_value = 108, },
}; };
/* WMM */
#define MWL8K_WMM_ENABLE 1
#define MWL8K_WMM_DISABLE 0
/* Slot time */ /* Slot time */
/* Short Slot: 9us slot time */ /* Short Slot: 9us slot time */
@ -2028,13 +2022,13 @@ static int mwl8k_set_wmm(struct ieee80211_hw *hw, bool enable)
cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_WMM_MODE); cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_WMM_MODE);
cmd->header.length = cpu_to_le16(sizeof(*cmd)); cmd->header.length = cpu_to_le16(sizeof(*cmd));
cmd->action = enable ? cpu_to_le16(MWL8K_CMD_SET) : 0; cmd->action = cpu_to_le16(!!enable);
rc = mwl8k_post_cmd(hw, &cmd->header); rc = mwl8k_post_cmd(hw, &cmd->header);
kfree(cmd); kfree(cmd);
if (!rc) if (!rc)
priv->wmm_mode = enable; priv->wmm_enabled = enable;
return rc; return rc;
} }
@ -2762,7 +2756,7 @@ static int mwl8k_start_wt(struct work_struct *wt)
} }
/* Disable WMM. WMM gets enabled when stack sends WMM parms */ /* Disable WMM. WMM gets enabled when stack sends WMM parms */
if (mwl8k_set_wmm(hw, MWL8K_WMM_DISABLE)) { if (mwl8k_set_wmm(hw, 0)) {
rc = -EIO; rc = -EIO;
goto mwl8k_start_exit; goto mwl8k_start_exit;
} }
@ -3272,11 +3266,12 @@ static int mwl8k_conf_tx_wt(struct work_struct *wt)
struct mwl8k_priv *priv = hw->priv; struct mwl8k_priv *priv = hw->priv;
int rc = 0; int rc = 0;
if (priv->wmm_mode == MWL8K_WMM_DISABLE) if (!priv->wmm_enabled) {
if (mwl8k_set_wmm(hw, MWL8K_WMM_ENABLE)) { if (mwl8k_set_wmm(hw, 1)) {
rc = -EINVAL; rc = -EINVAL;
goto mwl8k_conf_tx_exit; goto mwl8k_conf_tx_exit;
} }
}
if (mwl8k_set_edca_params(hw, GET_TXQ(queue), params->cw_min, if (mwl8k_set_edca_params(hw, GET_TXQ(queue), params->cw_min,
params->cw_max, params->aifs, params->txop)) params->cw_max, params->aifs, params->txop))
@ -3446,7 +3441,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
priv->hostcmd_wait = NULL; priv->hostcmd_wait = NULL;
priv->tx_wait = NULL; priv->tx_wait = NULL;
priv->inconfig = false; priv->inconfig = false;
priv->wmm_mode = false; priv->wmm_enabled = false;
priv->pending_tx_pkts = 0; priv->pending_tx_pkts = 0;
strncpy(priv->name, MWL8K_NAME, sizeof(priv->name)); strncpy(priv->name, MWL8K_NAME, sizeof(priv->name));